Skip to content

Commit 602bf18

Browse files
committed
Merge branch 'for-6.7' into for-next
2 parents ac4890f + 67e18e1 commit 602bf18

File tree

12,468 files changed

+438510
-150423
lines changed

Some content is hidden

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

12,468 files changed

+438510
-150423
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ ForEachMacros:
254254
- 'for_each_free_mem_range'
255255
- 'for_each_free_mem_range_reverse'
256256
- 'for_each_func_rsrc'
257+
- 'for_each_group_device'
257258
- 'for_each_group_evsel'
258259
- 'for_each_group_member'
259260
- 'for_each_hstate'

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.[ch] diff=cpp
33
*.dts diff=dts
44
*.dts[io] diff=dts
5+
*.rs diff=rust

.mailmap

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
7070
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
7171
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
7272
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
73+
Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
74+
Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
7375
Ben Gardner <bgardner@wabtec.com>
7476
Ben M Cahill <ben.m.cahill@intel.com>
7577
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
@@ -181,6 +183,8 @@ Henrik Rydberg <rydberg@bitmath.org>
181183
Herbert Xu <herbert@gondor.apana.org.au>
182184
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
183185
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
186+
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
187+
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
184188
Jacob Shin <Jacob.Shin@amd.com>
185189
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
186190
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
@@ -233,6 +237,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
233237
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
234238
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
235239
John Crispin <john@phrozen.org> <blogic@openwrt.org>
240+
John Keeping <john@keeping.me.uk> <john@metanate.com>
236241
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
237242
John Stultz <johnstul@us.ibm.com>
238243
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -327,6 +332,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
327332
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
328333
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
329334
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
335+
Maxime Ripard <mripard@kernel.org> <maxime@cerno.tech>
330336
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
331337
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
332338
Mayuresh Janorkar <mayur@ti.com>
@@ -364,6 +370,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
364370
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
365371
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
366372
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
373+
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
374+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
375+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
376+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
377+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
367378
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
368379
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
369380
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,12 @@ E: tomas@nocrew.org
383383
W: http://tomas.nocrew.org/
384384
D: dsp56k device driver
385385

386+
N: Srivatsa S. Bhat
387+
E: srivatsa@csail.mit.edu
388+
D: Maintainer of Generic Paravirt-Ops subsystem
389+
D: Maintainer of VMware hypervisor interface
390+
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)
391+
386392
N: Ross Biro
387393
E: ross.biro@gmail.com
388394
D: Original author of the Linux networking code
@@ -1706,6 +1712,10 @@ S: Panoramastrasse 18
17061712
S: D-69126 Heidelberg
17071713
S: Germany
17081714

1715+
N: Neil Horman
1716+
M: nhorman@tuxdriver.com
1717+
D: SCTP protocol maintainer.
1718+
17091719
N: Simon Horman
17101720
M: horms@verge.net.au
17111721
D: Renesas ARM/ARM64 SoC maintainer
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/wmi/devices/05901221-D566-11D1-B2F0-00A0C9062910[-X]/bmof
2+
Date: Jun 2017
3+
KernelVersion: 4.13
4+
Description:
5+
Binary MOF metadata used to decribe the details of available ACPI WMI interfaces.
6+
7+
See Documentation/wmi/devices/wmi-bmof.rst for details.

Documentation/ABI/testing/debugfs-dell-wmi-ddv

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,32 @@ Date: September 2022
33
KernelVersion: 6.1
44
Contact: Armin Wolf <W_Armin@gmx.de>
55
Description:
6-
This file contains the contents of the fan sensor information buffer,
7-
which contains fan sensor entries and a terminating character (0xFF).
6+
This file contains the contents of the fan sensor information
7+
buffer, which contains fan sensor entries and a terminating
8+
character (0xFF).
89

9-
Each fan sensor entry consists of three bytes with an unknown meaning,
10-
interested people may use this file for reverse-engineering.
10+
Each fan sensor entry contains:
11+
12+
- fan type (single byte)
13+
- fan speed in RPM (two bytes, little endian)
14+
15+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.
1116

1217
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
1318
Date: September 2022
1419
KernelVersion: 6.1
1520
Contact: Armin Wolf <W_Armin@gmx.de>
1621
Description:
17-
This file contains the contents of the thermal sensor information buffer,
18-
which contains thermal sensor entries and a terminating character (0xFF).
22+
This file contains the contents of the thermal sensor information
23+
buffer, which contains thermal sensor entries and a terminating
24+
character (0xFF).
25+
26+
Each thermal sensor entry contains:
27+
28+
- thermal type (single byte)
29+
- current temperature (single byte)
30+
- min. temperature (single byte)
31+
- max. temperature (single byte)
32+
- unknown field (single byte)
1933

20-
Each thermal sensor entry consists of five bytes with an unknown meaning,
21-
interested people may use this file for reverse-engineering.
34+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.

Documentation/ABI/testing/sysfs-block-device

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,25 @@ Description:
9595
This file does not exist if the HBA driver does not implement
9696
support for the SATA NCQ priority feature, regardless of the
9797
device support for this feature.
98+
99+
100+
What: /sys/block/*/device/cdl_supported
101+
Date: May, 2023
102+
KernelVersion: v6.5
103+
Contact: linux-scsi@vger.kernel.org
104+
Description:
105+
(RO) Indicates if the device supports the command duration
106+
limits feature found in some ATA and SCSI devices.
107+
108+
109+
What: /sys/block/*/device/cdl_enable
110+
Date: May, 2023
111+
KernelVersion: v6.5
112+
Contact: linux-scsi@vger.kernel.org
113+
Description:
114+
(RW) For a device supporting the command duration limits
115+
feature, write to the file to turn on or off the feature.
116+
By default this feature is turned off.
117+
Writing "1" to this file enables the use of command duration
118+
limits for read and write commands in the kernel and turns on
119+
the feature on the device. Writing "0" disables the feature.

Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ Description:
243243

244244
index:
245245
Used with HDD and NVME authentication to set the drive index
246-
that is being referenced (e.g hdd0, hdd1 etc)
247-
This attribute defaults to device 0.
246+
that is being referenced (e.g hdd1, hdd2 etc)
247+
This attribute defaults to device 1.
248248

249249
certificate, signature, save_signature:
250250
These attributes are used for certificate based authentication. This is

Documentation/ABI/testing/sysfs-class-led-trigger-netdev

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ Description:
1313
Specifies the duration of the LED blink in milliseconds.
1414
Defaults to 50 ms.
1515

16+
With hw_control ON, the interval value MUST be set to the
17+
default value and cannot be changed.
18+
Trying to set any value in this specific mode will return
19+
an EINVAL error.
20+
1621
What: /sys/class/leds/<led>/link
1722
Date: Dec 2017
1823
KernelVersion: 4.16
@@ -39,6 +44,9 @@ Description:
3944
If set to 1, the LED will blink for the milliseconds specified
4045
in interval to signal transmission.
4146

47+
With hw_control ON, the blink interval is controlled by hardware
48+
and won't reflect the value set in interval.
49+
4250
What: /sys/class/leds/<led>/rx
4351
Date: Dec 2017
4452
KernelVersion: 4.16
@@ -50,3 +58,84 @@ Description:
5058

5159
If set to 1, the LED will blink for the milliseconds specified
5260
in interval to signal reception.
61+
62+
With hw_control ON, the blink interval is controlled by hardware
63+
and won't reflect the value set in interval.
64+
65+
What: /sys/class/leds/<led>/hw_control
66+
Date: Jun 2023
67+
KernelVersion: 6.5
68+
Contact: linux-leds@vger.kernel.org
69+
Description:
70+
Communicate whether the LED trigger modes are driven by hardware
71+
or software fallback is used.
72+
73+
If 0, the LED is using software fallback to blink.
74+
75+
If 1, the LED is using hardware control to blink and signal the
76+
requested modes.
77+
78+
What: /sys/class/leds/<led>/link_10
79+
Date: Jun 2023
80+
KernelVersion: 6.5
81+
Contact: linux-leds@vger.kernel.org
82+
Description:
83+
Signal the link speed state of 10Mbps of the named network device.
84+
85+
If set to 0 (default), the LED's normal state is off.
86+
87+
If set to 1, the LED's normal state reflects the link state
88+
speed of 10MBps of the named network device.
89+
Setting this value also immediately changes the LED state.
90+
91+
What: /sys/class/leds/<led>/link_100
92+
Date: Jun 2023
93+
KernelVersion: 6.5
94+
Contact: linux-leds@vger.kernel.org
95+
Description:
96+
Signal the link speed state of 100Mbps of the named network device.
97+
98+
If set to 0 (default), the LED's normal state is off.
99+
100+
If set to 1, the LED's normal state reflects the link state
101+
speed of 100Mbps of the named network device.
102+
Setting this value also immediately changes the LED state.
103+
104+
What: /sys/class/leds/<led>/link_1000
105+
Date: Jun 2023
106+
KernelVersion: 6.5
107+
Contact: linux-leds@vger.kernel.org
108+
Description:
109+
Signal the link speed state of 1000Mbps of the named network device.
110+
111+
If set to 0 (default), the LED's normal state is off.
112+
113+
If set to 1, the LED's normal state reflects the link state
114+
speed of 1000Mbps of the named network device.
115+
Setting this value also immediately changes the LED state.
116+
117+
What: /sys/class/leds/<led>/half_duplex
118+
Date: Jun 2023
119+
KernelVersion: 6.5
120+
Contact: linux-leds@vger.kernel.org
121+
Description:
122+
Signal the link half duplex state of the named network device.
123+
124+
If set to 0 (default), the LED's normal state is off.
125+
126+
If set to 1, the LED's normal state reflects the link half
127+
duplex state of the named network device.
128+
Setting this value also immediately changes the LED state.
129+
130+
What: /sys/class/leds/<led>/full_duplex
131+
Date: Jun 2023
132+
KernelVersion: 6.5
133+
Contact: linux-leds@vger.kernel.org
134+
Description:
135+
Signal the link full duplex state of the named network device.
136+
137+
If set to 0 (default), the LED's normal state is off.
138+
139+
If set to 1, the LED's normal state reflects the link full
140+
duplex state of the named network device.
141+
Setting this value also immediately changes the LED state.

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ Description: Preferred MTE tag checking mode
670670
"async" Prefer asynchronous mode
671671
================ ==============================================
672672

673-
See also: Documentation/arm64/memory-tagging-extension.rst
673+
See also: Documentation/arch/arm64/memory-tagging-extension.rst
674674

675675
What: /sys/devices/system/cpu/nohz_full
676676
Date: Apr 2015

0 commit comments

Comments
 (0)