Skip to content

Commit 2487b6b

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/urgent, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents c8c8145 + 2df0c02 commit 2487b6b

File tree

1,015 files changed

+25297
-16806
lines changed

Some content is hidden

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

1,015 files changed

+25297
-16806
lines changed

Documentation/ABI/README

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
This directory attempts to document the ABI between the Linux kernel and
1+
This part of the documentation inside Documentation/ABI directory
2+
attempts to document the ABI between the Linux kernel and
23
userspace, and the relative stability of these interfaces. Due to the
34
everchanging nature of Linux, and the differing maturity levels, these
45
interfaces should be used by userspace programs in different ways.

Documentation/ABI/removed/sysfs-class-rfkill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For details to this subsystem look at Documentation/driver-api/rfkill.rst.
44

55
What: /sys/class/rfkill/rfkill[0-9]+/claim
66
Date: 09-Jul-2007
7-
KernelVersion v2.6.22
7+
KernelVersion: v2.6.22
88
Contact: linux-wireless@vger.kernel.org
99
Description: This file was deprecated because there no longer was a way to
1010
claim just control over a single rfkill instance.

Documentation/ABI/stable/sysfs-class-rfkill

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ Description: The rfkill class subsystem folder.
1616

1717
What: /sys/class/rfkill/rfkill[0-9]+/name
1818
Date: 09-Jul-2007
19-
KernelVersion v2.6.22
19+
KernelVersion: v2.6.22
2020
Contact: linux-wireless@vger.kernel.org
2121
Description: Name assigned by driver to this key (interface or driver name).
2222
Values: arbitrary string.
2323

2424

2525
What: /sys/class/rfkill/rfkill[0-9]+/type
2626
Date: 09-Jul-2007
27-
KernelVersion v2.6.22
27+
KernelVersion: v2.6.22
2828
Contact: linux-wireless@vger.kernel.org
2929
Description: Driver type string ("wlan", "bluetooth", etc).
3030
Values: See include/linux/rfkill.h.
3131

3232

3333
What: /sys/class/rfkill/rfkill[0-9]+/persistent
3434
Date: 09-Jul-2007
35-
KernelVersion v2.6.22
35+
KernelVersion: v2.6.22
3636
Contact: linux-wireless@vger.kernel.org
3737
Description: Whether the soft blocked state is initialised from non-volatile
3838
storage at startup.
@@ -44,7 +44,7 @@ Values: A numeric value:
4444

4545
What: /sys/class/rfkill/rfkill[0-9]+/state
4646
Date: 09-Jul-2007
47-
KernelVersion v2.6.22
47+
KernelVersion: v2.6.22
4848
Contact: linux-wireless@vger.kernel.org
4949
Description: Current state of the transmitter.
5050
This file was scheduled to be removed in 2014, but due to its
@@ -67,7 +67,7 @@ Values: A numeric value.
6767

6868
What: /sys/class/rfkill/rfkill[0-9]+/hard
6969
Date: 12-March-2010
70-
KernelVersion v2.6.34
70+
KernelVersion: v2.6.34
7171
Contact: linux-wireless@vger.kernel.org
7272
Description: Current hardblock state. This file is read only.
7373
Values: A numeric value.
@@ -81,7 +81,7 @@ Values: A numeric value.
8181

8282
What: /sys/class/rfkill/rfkill[0-9]+/soft
8383
Date: 12-March-2010
84-
KernelVersion v2.6.34
84+
KernelVersion: v2.6.34
8585
Contact: linux-wireless@vger.kernel.org
8686
Description: Current softblock state. This file is read and write.
8787
Values: A numeric value.

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ Description: Default value for the Data Stream Control Register (DSCR) on
2424
If set by a process it will be inherited by child processes.
2525
Values: 64 bit unsigned integer (bit field)
2626

27-
What: /sys/devices/system/cpu/cpuX/topology/physical_package_id
28-
Description: physical package id of cpuX. Typically corresponds to a physical
29-
socket number, but the actual value is architecture and platform
30-
dependent.
31-
Values: integer
32-
3327
What: /sys/devices/system/cpu/cpuX/topology/die_id
3428
Description: the CPU die ID of cpuX. Typically it is the hardware platform's
3529
identifier (rather than the kernel's). The actual value is
@@ -86,10 +80,6 @@ What: /sys/devices/system/cpu/cpuX/topology/die_cpus
8680
Description: internal kernel map of CPUs within the same die.
8781
Values: hexadecimal bitmask.
8882

89-
What: /sys/devices/system/cpu/cpuX/topology/ppin
90-
Description: per-socket protected processor inventory number
91-
Values: hexadecimal.
92-
9383
What: /sys/devices/system/cpu/cpuX/topology/die_cpus_list
9484
Description: human-readable list of CPUs within the same die.
9585
The format is like 0-3, 8-11, 14,17.

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ Description: Controls whether PRS disable is turned on for the workqueue.
246246
capability.
247247

248248
What: /sys/bus/dsa/devices/wq<m>.<n>/occupancy
249-
Date May 25, 2021
249+
Date: May 25, 2021
250250
KernelVersion: 5.14.0
251251
Contact: dmaengine@vger.kernel.org
252252
Description: Show the current number of entries in this WQ if WQ Occupancy
253253
Support bit WQ capabilities is 1.
254254

255255
What: /sys/bus/dsa/devices/wq<m>.<n>/enqcmds_retries
256-
Date Oct 29, 2021
256+
Date: Oct 29, 2021
257257
KernelVersion: 5.17.0
258258
Contact: dmaengine@vger.kernel.org
259259
Description: Indicate the number of retires for an enqcmds submission on a sharedwq.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Description:
4747
midi1_first_group The first UMP Group number for MIDI 1.0 (0-15)
4848
midi1_num_groups The number of groups for MIDI 1.0 (0-16)
4949
ui_hint 0: unknown, 1: receiver, 2: sender, 3: both
50-
midi_ci_verison Supported MIDI-CI version number (8 bit)
50+
midi_ci_version Supported MIDI-CI version number (8 bit)
5151
is_midi1 Legacy MIDI 1.0 device (0, 1 or 2)
5252
sysex8_streams Max number of SysEx8 streams (8 bit)
5353
active Active FB flag (0 or 1)

0 commit comments

Comments
 (0)