Skip to content

Commit 594ce0b

Browse files
author
Russell King (Oracle)
committed
Merge topic branches 'clkdev' and 'fixes' into for-linus
2 parents 616501e + e3cf20e commit 594ce0b

File tree

19,511 files changed

+1172004
-484191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

19,511 files changed

+1172004
-484191
lines changed

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
22
33
Christoph Hellwig <[email protected]>
4+
Jeff Kirsher <[email protected]>
45
Marc Gonzalez <[email protected]>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
*.xz
5353
*.zst
5454
Module.symvers
55+
dtbs-list
5556
modules.order
5657

5758
#

.mailmap

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Adam Oldham <[email protected]>
2020
Adam Radford <[email protected]>
2121
2222
Adrian Bunk <[email protected]>
23+
2324
2425
2526
@@ -36,6 +37,17 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3637
Alexei Starovoitov <[email protected]> <[email protected]>
3738
Alexei Starovoitov <[email protected]> <[email protected]>
3839
Alexei Starovoitov <[email protected]> <[email protected]>
40+
41+
Alex Elder <[email protected]>
42+
43+
44+
45+
46+
47+
48+
49+
50+
3951
4052
4153
@@ -85,6 +97,11 @@ Baolin Wang <[email protected]> <[email protected]>
8597
8698
8799
100+
101+
102+
103+
104+
88105
89106
90107
Bartosz Golaszewski <[email protected]> <[email protected]>
@@ -96,6 +113,8 @@ Ben Widawsky <[email protected]> <[email protected]>
96113
97114
98115
116+
Benjamin Tissoires <[email protected]> <[email protected]>
117+
Benjamin Tissoires <[email protected]> <[email protected]>
99118
100119
101120
@@ -110,9 +129,11 @@ Brendan Higgins <[email protected]> <[email protected]>
110129
Brian Avery <[email protected]>
111130
Brian King <[email protected]>
112131
132+
113133
114134
115135
136+
116137
117138
118139
@@ -289,6 +310,7 @@ Johan Hovold <[email protected]> <[email protected]>
289310
290311
291312
313+
292314
293315
294316
John Paul Adrian Glaubitz <[email protected]>
@@ -340,7 +362,8 @@ Lee Jones <[email protected]> <[email protected]>
340362
341363
342364
343-
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
365+
366+
344367
345368
Leonard Göhrs <[email protected]>
346369
Leonid I Ananiev <[email protected]>
@@ -439,10 +462,14 @@ Mukesh Ojha <[email protected]> <[email protected]>
439462
440463
441464
Mythri P K <[email protected]>
465+
466+
442467
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
443-
468+
469+
444470
445-
471+
472+
446473
447474
Nguyen Anh Quynh <[email protected]>
448475
@@ -493,9 +520,11 @@ Praveen BP <[email protected]>
493520
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
494521
495522
523+
496524
497525
498-
526+
527+
499528
500529
501530
@@ -517,6 +546,7 @@ Rémi Denis-Courmont <[email protected]>
517546
518547
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
519548
549+
520550
521551
522552
@@ -525,6 +555,7 @@ Rocky Liao <[email protected]> <[email protected]>
525555
526556
527557
558+
528559
529560
530561
@@ -541,7 +572,7 @@ Sarangdhar Joshi <[email protected]>
541572
Sascha Hauer <[email protected]>
542573
543574
Sathishkumar Muruganandam <[email protected]> <[email protected]>
544-
575+
545576
S.Çağlar Onur <[email protected]>
546577
547578
Sean Christopherson <[email protected]> <[email protected]>
@@ -573,6 +604,7 @@ Simon Kelley <[email protected]>
573604
Sricharan Ramabadhran <[email protected]> <[email protected]>
574605
575606
607+
576608
Stéphane Witzmann <[email protected]>
577609
578610
@@ -646,6 +678,7 @@ Viresh Kumar <[email protected]> <[email protected]>
646678
647679
648680
681+
649682
650683
651684

CREDITS

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ D: dosfs, LILO, some fd features, ATM, various other hacks here and there
6363
S: Buenos Aires
6464
S: Argentina
6565

66+
NTFS FILESYSTEM
67+
N: Anton Altaparmakov
68+
69+
D: NTFS filesystem
70+
6671
N: Tim Alpaerts
6772
6873
D: 802.2 class II logical link control layer,
@@ -2955,6 +2960,11 @@ S: 2364 Old Trail Drive
29552960
S: Reston, Virginia 20191
29562961
S: USA
29572962

2963+
N: Sekhar Nori
2964+
2965+
D: Maintainer of Texas Instruments DaVinci machine support, contributor
2966+
D: to device drivers relevant to that SoC family.
2967+
29582968
N: Fredrik Noring
29592969
29602970
W: http://www.lysator.liu.se/~noring/
@@ -3136,6 +3146,10 @@ S: Triftstra=DFe 55
31363146
S: 13353 Berlin
31373147
S: Germany
31383148

3149+
N: Gustavo Pimental
3150+
3151+
D: PCI driver for Synopsys DesignWare
3152+
31393153
N: Emanuel Pirker
31403154
31413155
D: AIC5800 IEEE 1394, RAW I/O on 1394

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ Description:
2828
/label ... (r/o) descriptive, not necessarily unique
2929
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
3030

31-
This ABI is deprecated and will be removed after 2020. It is
32-
replaced with the GPIO character device.
31+
This ABI is obsoleted by Documentation/ABI/testing/gpio-cdev and will be
32+
removed after 2020.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/firmware/efi/vars
2+
Date: April 2004, removed March 2023
3+
Description:
4+
This directory exposed interfaces for interacting with
5+
EFI variables. For more information on EFI variables,
6+
see 'Variable Services' in the UEFI specification
7+
(section 7.2 in specification version 2.3 Errata D).
8+
9+
The 'efivars' sysfs interface was removed in March of 2023,
10+
after being considered deprecated no later than September
11+
of 2020. Its functionality has been replaced by the
12+
'efivarfs' filesystem.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ Description:
101101
devices that support receiving integrity metadata.
102102

103103

104+
What: /sys/block/<disk>/partscan
105+
Date: May 2024
106+
Contact: Christoph Hellwig <[email protected]>
107+
Description:
108+
The /sys/block/<disk>/partscan files reports if partition
109+
scanning is enabled for the disk. It returns "1" if partition
110+
scanning is enabled, or "0" if not. The value type is a 32-bit
111+
unsigned integer, but only "0" and "1" are valid values.
112+
113+
104114
What: /sys/block/<disk>/<partition>/alignment_offset
105115
Date: April 2009
106116
Contact: Martin K. Petersen <[email protected]>
@@ -584,18 +594,6 @@ Description:
584594
the data. If no such restriction exists, this file will contain
585595
'0'. This file is writable for testing purposes.
586596

587-
588-
What: /sys/block/<disk>/queue/throttle_sample_time
589-
Date: March 2017
590-
591-
Description:
592-
[RW] This is the time window that blk-throttle samples data, in
593-
millisecond. blk-throttle makes decision based on the
594-
samplings. Lower time means cgroups have more smooth throughput,
595-
but higher CPU overhead. This exists only when
596-
CONFIG_BLK_DEV_THROTTLING_LOW is enabled.
597-
598-
599597
What: /sys/block/<disk>/queue/virt_boundary_mask
600598
Date: April 2021
601599

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ Description: Initiates a SoC reset on the MHI controller. A SoC reset is
2929
This can be useful as a method of recovery if the device is
3030
non-responsive, or as a means of loading new firmware as a
3131
system administration task.
32+
33+
What: /sys/bus/mhi/devices/.../trigger_edl
34+
Date: April 2024
35+
KernelVersion: 6.10
36+
37+
Description: Writing a non-zero value to this file will force devices to
38+
enter EDL (Emergency Download) mode. This entry only exists for
39+
devices capable of entering the EDL mode using the standard EDL
40+
triggering mechanism defined in the MHI spec v1.2. Once in EDL
41+
mode, the flash programmer image can be downloaded to the
42+
device to enter the flash programmer execution environment.
43+
This can be useful if user wants to use QDL (Qualcomm Download,
44+
which is used to download firmware over EDL) to update firmware.

Documentation/ABI/stable/sysfs-firmware-efi-vars

Lines changed: 0 additions & 79 deletions
This file was deleted.

Documentation/ABI/testing/configfs-usb-gadget-ffs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ KernelVersion: 3.13
44
Description: The purpose of this directory is to create and remove it.
55

66
A corresponding USB function instance is created/removed.
7-
There are no attributes here.
87

9-
All parameters are set through FunctionFS.
8+
All attributes are read only:
9+
10+
============= ============================================
11+
ready 1 if the function is ready to be used, E.G.
12+
if userspace has written descriptors and
13+
strings to ep0, so the gadget can be
14+
enabled - 0 otherwise.
15+
============= ============================================
16+
17+
All other parameters are set through FunctionFS.

0 commit comments

Comments
 (0)