Skip to content

Commit a940daa

Browse files
committed
Merge branch 'linus' into smp/core
Pull in upstream to get the fixes so depending changes can be applied.
2 parents 32e4fa3 + 5872080 commit a940daa

File tree

15,111 files changed

+509950
-236785
lines changed

Some content is hidden

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

15,111 files changed

+509950
-236785
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ modules.order
7474
#
7575
# RPM spec file (make rpm-pkg)
7676
#
77-
/*.spec
77+
/kernel.spec
7878
/rpmbuild/
7979

8080
#

.mailmap

Lines changed: 102 additions & 1 deletion
Large diffs are not rendered by default.

CREDITS

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,6 @@ S: Tamsui town, Taipei county,
666666
S: Taiwan 251
667667
S: Republic of China
668668

669-
N: Reinette Chatre
670-
E: reinette.chatre@intel.com
671-
D: WiMedia Link Protocol implementation
672-
D: UWB stack bits and pieces
673-
674669
N: Michael Elizabeth Chastain
675670
E: mec@shout.net
676671
D: Configure, Menuconfig, xconfig
@@ -3023,12 +3018,6 @@ S: Demonstratsii 8-382
30233018
S: Tula 300000
30243019
S: Russia
30253020

3026-
N: Inaky Perez-Gonzalez
3027-
E: inaky.perez-gonzalez@intel.com
3028-
D: UWB stack, HWA-RC driver and HWA-HC drivers
3029-
D: Wireless USB additions to the USB stack
3030-
D: WiMedia Link Protocol bits and pieces
3031-
30323021
N: Gordon Peters
30333022
E: GordPeters@smarttech.com
30343023
D: Isochronous receive for IEEE 1394 driver (OHCI module).

Documentation/ABI/stable/sysfs-block

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Description:
295295
capable of executing requests targeting different sector ranges
296296
in parallel. For instance, single LUN multi-actuator hard-disks
297297
will have an independent_access_ranges directory if the device
298-
correctly advertizes the sector ranges of its actuators.
298+
correctly advertises the sector ranges of its actuators.
299299

300300
The independent_access_ranges directory contains one directory
301301
per access range, with each range described using the sector

Documentation/ABI/stable/sysfs-bus-mhi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/mhi/devices/.../serialnumber
22
Date: Sept 2020
33
KernelVersion: 5.10
4-
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
4+
Contact: mhi@lists.linux.dev
55
Description: The file holds the serial number of the client device obtained
66
using a BHI (Boot Host Interface) register read after at least
77
one attempt to power up the device has been done. If read
@@ -12,7 +12,7 @@ Users: Any userspace application or clients interested in device info.
1212
What: /sys/bus/mhi/devices/.../oem_pk_hash
1313
Date: Sept 2020
1414
KernelVersion: 5.10
15-
Contact: Bhaumik Bhatt <bbhatt@codeaurora.org>
15+
Contact: mhi@lists.linux.dev
1616
Description: The file holds the OEM PK Hash value of the endpoint device
1717
obtained using a BHI (Boot Host Interface) register read after
1818
at least one attempt to power up the device has been done. If

Documentation/ABI/stable/sysfs-class-infiniband

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Description:
356356
pkeys/<n>: (RO) Displays the contents of the physical
357357
key table n = 0..126
358358

359-
mcgs/: (RO) Muticast group table
359+
mcgs/: (RO) Multicast group table
360360

361361
<m>/gid_idx/0: (RO) Display the GID mapping m = 1..2
362362

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ What: /sys/bus/dsa/devices/dsa<m>/pasid_enabled
8484
Date: Oct 27, 2020
8585
KernelVersion: 5.11.0
8686
Contact: dmaengine@vger.kernel.org
87-
Description: To indicate if PASID (process address space identifier) is
87+
Description: To indicate if user PASID (process address space identifier) is
8888
enabled or not for this device.
8989

9090
What: /sys/bus/dsa/devices/dsa<m>/state

Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,3 +662,56 @@ Description: This file shows the system reset cause due to AC power failure.
662662
Value 1 in file means this is reset cause, 0 - otherwise.
663663

664664
The file is read only.
665+
666+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_pn
667+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_version
668+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_version_min
669+
Date: August 2023
670+
KernelVersion: 6.6
671+
Contact: Vadim Pasternak <vadimp@nvidia.com>
672+
Description: These files show with which CPLD part numbers, version and minor
673+
versions have been burned the 5-th CPLD device equipped on a
674+
system.
675+
676+
The files are read only.
677+
678+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_cap
679+
Date: August 2023
680+
KernelVersion: 6.6
681+
Contact: Vadim Pasternak <vadimp@nvidia.com>
682+
Description: This file indicates the available method of CPLD/FPGA devices
683+
field update through the JTAG chain:
684+
685+
b00 - field update through LPC bus register memory space.
686+
b01 - Reserved.
687+
b10 - Reserved.
688+
b11 - field update through CPU GPIOs bit-banging.
689+
690+
The file is read only.
691+
692+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/lid_open
693+
Date: August 2023
694+
KernelVersion: 6.6
695+
Contact: Vadim Pasternak <vadimp@nvidia.com>
696+
Description: 1 - indicates that system lid is opened, otherwise 0.
697+
698+
The file is read only.
699+
700+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_long_pwr_pb
701+
Date: August 2023
702+
KernelVersion: 6.6
703+
Contact: Vadim Pasternak <vadimp@nvidia.com>
704+
Description: This file if set 1 indicates that system has been reset by
705+
long press of power button.
706+
707+
The file is read only.
708+
709+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_dc_dc_pwr_fail
710+
Date: August 2023
711+
KernelVersion: 6.6
712+
Contact: Vadim Pasternak <vadimp@nvidia.com>
713+
Description: This file shows 1 in case the system reset happened due to the
714+
failure of any DC-DC power converter devices equipped on the
715+
switch board.
716+
717+
The file is read only.

Documentation/ABI/stable/sysfs-platform-wmi-bmof

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ What: /sys/bus/wmi/devices/05901221-D566-11D1-B2F0-00A0C9062910[-X]/bmof
22
Date: Jun 2017
33
KernelVersion: 4.13
44
Description:
5-
Binary MOF metadata used to decribe the details of available ACPI WMI interfaces.
5+
Binary MOF metadata used to describe the details of available ACPI WMI interfaces.
66

77
See Documentation/wmi/devices/wmi-bmof.rst for details.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
What: /config/usb-gadget/gadget/functions/midi2.name
2+
Date: Jul 2023
3+
KernelVersion: 6.6
4+
Description:
5+
The attributes:
6+
7+
============ ===============================================
8+
process_ump Flag to process UMP Stream messages (0 or 1)
9+
static_block Flag for static blocks (0 or 1)
10+
iface_name MIDI interface name string
11+
============ ===============================================
12+
13+
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number
14+
Date: Jul 2023
15+
KernelVersion: 6.6
16+
Description:
17+
This group contains a UMP Endpoint configuration.
18+
A new Endpoint starts from 0, and can be up to 3.
19+
20+
The attributes:
21+
22+
============= ===============================================
23+
protocol_caps MIDI protocol capabilities (1, 2 or 3 for both)
24+
protocol Default MIDI protocol (1 or 2)
25+
ep_name UMP Endpoint name string
26+
product_id Product ID string
27+
manufacturer Manufacture ID (24 bit)
28+
family Device family ID (16 bit)
29+
model Device model ID (16 bit)
30+
sw_revision Software Revision (32 bit)
31+
============= ===============================================
32+
33+
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number/block.number
34+
Date: Jul 2023
35+
KernelVersion: 6.6
36+
Description:
37+
This group contains a UMP Function Block configuration.
38+
A new block starts from 0, and can be up to 31.
39+
40+
The attributes:
41+
42+
================= ==============================================
43+
name Function Block name string
44+
direction 1: input, 2: output, 3: bidirectional
45+
first_group The first UMP Group number (0-15)
46+
num_groups The number of groups in this FB (1-16)
47+
midi1_first_group The first UMP Group number for MIDI 1.0 (0-15)
48+
midi1_num_groups The number of groups for MIDI 1.0 (0-16)
49+
ui_hint 0: unknown, 1: receiver, 2: sender, 3: both
50+
midi_ci_verison Supported MIDI-CI version number (8 bit)
51+
is_midi1 Legacy MIDI 1.0 device (0, 1 or 2)
52+
sysex8_streams Max number of SysEx8 streams (8 bit)
53+
active Active FB flag (0 or 1)
54+
================= ==============================================

0 commit comments

Comments
 (0)