Skip to content

Commit

Permalink
Merge v6.5-rc1 into drm-misc-fixes
Browse files Browse the repository at this point in the history
Boris needs 6.5-rc1 in drm-misc-fixes to prevent a conflict.

Signed-off-by: Maxime Ripard <[email protected]>
  • Loading branch information
mripard committed Jul 11, 2023
2 parents a2848d0 + 06c2afb commit 2f98e68
Show file tree
Hide file tree
Showing 14,102 changed files with 524,710 additions and 168,808 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ ForEachMacros:
- 'for_each_free_mem_range'
- 'for_each_free_mem_range_reverse'
- 'for_each_func_rsrc'
- 'for_each_group_device'
- 'for_each_group_evsel'
- 'for_each_group_member'
- 'for_each_hstate'
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.[ch] diff=cpp
*.dts diff=dts
*.dts[io] diff=dts
*.rs diff=rust
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*.bin
*.bz2
*.c.[012]*.*
*.cover
*.dt.yaml
*.dtb
*.dtbo
Expand All @@ -34,7 +33,6 @@
*.lz4
*.lzma
*.lzo
*.mbx
*.mod
*.mod.c
*.o
Expand All @@ -51,7 +49,6 @@
*.symversions
*.tab.[ch]
*.tar
*.usyms
*.xz
*.zst
Module.symvers
Expand Down Expand Up @@ -112,7 +109,6 @@ modules.order
#
/include/config/
/include/generated/
/include/ksym/
/arch/*/include/generated/

# stgit generated dirs
Expand Down
16 changes: 15 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
# same person appearing not to be so or badly displayed. Also allows for
# old email addresses to map to new email addresses.
#
# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in
# "man git-shortlog" on older systems.
#
# Please keep this list dictionary sorted.
#
Expand Down Expand Up @@ -70,6 +71,8 @@ Baolin Wang <[email protected]> <[email protected]>
Baolin Wang <[email protected]> <[email protected]>
Bart Van Assche <[email protected]> <[email protected]>
Bart Van Assche <[email protected]> <[email protected]>
Ben Dooks <[email protected]> <[email protected]>
Ben Dooks <[email protected]> <[email protected]>
Ben Gardner <[email protected]>
Ben M Cahill <[email protected]>
Ben Widawsky <[email protected]> <[email protected]>
Expand Down Expand Up @@ -175,12 +178,17 @@ Gustavo Padovan <[email protected]>
Hanjun Guo <[email protected]> <[email protected]>
Heiko Carstens <[email protected]> <[email protected]>
Heiko Carstens <[email protected]> <[email protected]>
Heiko Stuebner <[email protected]> <[email protected]>
Heiko Stuebner <[email protected]> <[email protected]>
Heiko Stuebner <[email protected]> <[email protected]>
Henk Vergonet <[email protected]>
Henrik Kretzschmar <[email protected]>
Henrik Rydberg <[email protected]>
Herbert Xu <[email protected]>
Huacai Chen <[email protected]> <[email protected]>
Huacai Chen <[email protected]> <[email protected]>
J. Bruce Fields <[email protected]> <[email protected]>
J. Bruce Fields <[email protected]> <[email protected]>
Jacob Shin <[email protected]>
Jaegeuk Kim <[email protected]> <[email protected]>
Jaegeuk Kim <[email protected]> <[email protected]>
Expand Down Expand Up @@ -271,6 +279,10 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
Kuninori Morimoto <[email protected]>
Kuogee Hsieh <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Lee Jones <[email protected]> <[email protected]>
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
Leonardo Bras <[email protected]> <[email protected]>
Leonard Göhrs <[email protected]>
Expand All @@ -297,6 +309,7 @@ Marek Behún <[email protected]> <[email protected]>
Marek Behún <[email protected]> Marek Behun <[email protected]>
Mark Brown <[email protected]>
Mark Starovoytov <[email protected]> <[email protected]>
Markus Schneider-Pargmann <[email protected]> <[email protected]>
Mark Yao <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Expand Down Expand Up @@ -328,6 +341,7 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
Maxim Mikityanskiy <[email protected]> <[email protected]>
Maxim Mikityanskiy <[email protected]> <[email protected]>
Maxime Ripard <[email protected]> <[email protected]>
Maxime Ripard <[email protected]> <[email protected]>
Maxime Ripard <[email protected]> <[email protected]>
Mayuresh Janorkar <[email protected]>
Expand Down
6 changes: 6 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,12 @@ E: [email protected]
W: http://tomas.nocrew.org/
D: dsp56k device driver

N: Srivatsa S. Bhat
E: [email protected]
D: Maintainer of Generic Paravirt-Ops subsystem
D: Maintainer of VMware hypervisor interface
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)

N: Ross Biro
E: [email protected]
D: Original author of the Linux networking code
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/obsolete/o2cb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
What: /sys/o2cb
Date: Dec 2005
KernelVersion: 2.6.16
Contact: ocfs2-devel@oss.oracle.com
Contact: ocfs2-devel@lists.linux.dev
Description: Ocfs2-tools looks at 'interface-revision' for versioning
information. Each logmask/ file controls a set of debug prints
and can be written into with the strings "allow", "deny", or
"off". Reading the file returns the current state.
Was renamed to /sys/fs/u2cb/
Users: ocfs2-tools. It's sufficient to mail proposed changes to
ocfs2-devel@oss.oracle.com.
ocfs2-devel@lists.linux.dev.
4 changes: 2 additions & 2 deletions Documentation/ABI/removed/o2cb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
What: /sys/o2cb symlink
Date: May 2011
KernelVersion: 3.0
Contact: ocfs2-devel@oss.oracle.com
Contact: ocfs2-devel@lists.linux.dev
Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
removed when new versions of ocfs2-tools which know to look
in /sys/fs/o2cb are sufficiently prevalent. Don't code new
software to look here, it should try /sys/fs/o2cb instead.
Users: ocfs2-tools. It's sufficient to mail proposed changes to
ocfs2-devel@oss.oracle.com.
ocfs2-devel@lists.linux.dev.
4 changes: 2 additions & 2 deletions Documentation/ABI/stable/o2cb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
What: /sys/fs/o2cb/
Date: Dec 2005
KernelVersion: 2.6.16
Contact: ocfs2-devel@oss.oracle.com
Contact: ocfs2-devel@lists.linux.dev
Description: Ocfs2-tools looks at 'interface-revision' for versioning
information. Each logmask/ file controls a set of debug prints
and can be written into with the strings "allow", "deny", or
"off". Reading the file returns the current state.
Users: ocfs2-tools. It's sufficient to mail proposed changes to
ocfs2-devel@oss.oracle.com.
ocfs2-devel@lists.linux.dev.
7 changes: 7 additions & 0 deletions Documentation/ABI/stable/sysfs-platform-wmi-bmof
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
What: /sys/bus/wmi/devices/05901221-D566-11D1-B2F0-00A0C9062910[-X]/bmof
Date: Jun 2017
KernelVersion: 4.13
Description:
Binary MOF metadata used to decribe the details of available ACPI WMI interfaces.

See Documentation/wmi/devices/wmi-bmof.rst for details.
29 changes: 21 additions & 8 deletions Documentation/ABI/testing/debugfs-dell-wmi-ddv
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,32 @@ Date: September 2022
KernelVersion: 6.1
Contact: Armin Wolf <[email protected]>
Description:
This file contains the contents of the fan sensor information buffer,
which contains fan sensor entries and a terminating character (0xFF).
This file contains the contents of the fan sensor information
buffer, which contains fan sensor entries and a terminating
character (0xFF).

Each fan sensor entry consists of three bytes with an unknown meaning,
interested people may use this file for reverse-engineering.
Each fan sensor entry contains:

- fan type (single byte)
- fan speed in RPM (two bytes, little endian)

See Documentation/wmi/devices/dell-wmi-ddv.rst for details.

What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
Date: September 2022
KernelVersion: 6.1
Contact: Armin Wolf <[email protected]>
Description:
This file contains the contents of the thermal sensor information buffer,
which contains thermal sensor entries and a terminating character (0xFF).
This file contains the contents of the thermal sensor information
buffer, which contains thermal sensor entries and a terminating
character (0xFF).

Each thermal sensor entry contains:

- thermal type (single byte)
- current temperature (single byte)
- min. temperature (single byte)
- max. temperature (single byte)
- unknown field (single byte)

Each thermal sensor entry consists of five bytes with an unknown meaning,
interested people may use this file for reverse-engineering.
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.
22 changes: 22 additions & 0 deletions Documentation/ABI/testing/sysfs-block-device
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,25 @@ Description:
This file does not exist if the HBA driver does not implement
support for the SATA NCQ priority feature, regardless of the
device support for this feature.


What: /sys/block/*/device/cdl_supported
Date: May, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(RO) Indicates if the device supports the command duration
limits feature found in some ATA and SCSI devices.


What: /sys/block/*/device/cdl_enable
Date: May, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(RW) For a device supporting the command duration limits
feature, write to the file to turn on or off the feature.
By default this feature is turned off.
Writing "1" to this file enables the use of command duration
limits for read and write commands in the kernel and turns on
the feature on the device. Writing "0" disables the feature.
54 changes: 54 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-counter
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,60 @@ Description:
counter does not freeze at the boundary points, but
counts continuously throughout.

interrupt on terminal count:
The output signal is initially low, and will remain low
until the counter reaches zero. The output signal then
goes high and remains high until a new preset value is
set.

hardware retriggerable one-shot:
The output signal is initially high. The output signal
will go low by a trigger input signal, and will remain
low until the counter reaches zero. The output will then
go high and remain high until the next trigger. A
trigger results in loading the counter to the preset
value and setting the output signal low, thus starting
the one-shot pulse.

rate generator:
The output signal is initially high. When the counter
has decremented to 1, the output signal goes low for one
clock pulse. The output signal then goes high again, the
counter is reloaded to the preset value, and the process
repeats in a periodic manner as such.

square wave mode:
The output signal is initially high.

If the initial count is even, the counter is decremented
by two on succeeding clock pulses. When the count
expires, the output signal changes value and the
counter is reloaded to the preset value. The process
repeats in periodic manner as such.

If the initial count is odd, the initial count minus one
(an even number) is loaded and then is decremented by
two on succeeding clock pulses. One clock pulse after
the count expires, the output signal goes low and the
counter is reloaded to the preset value minus one.
Succeeding clock pulses decrement the count by two. When
the count expires, the output goes high again and the
counter is reloaded to the preset value minus one. The
process repeats in a periodic manner as such.

software triggered strobe:
The output signal is initially high. When the count
expires, the output will go low for one clock pulse and
then go high again. The counting sequence is "triggered"
by setting the preset value.

hardware triggered strobe:
The output signal is initially high. Counting is started
by a trigger input signal. When the count expires, the
output signal will go low for one clock pulse and then
go high again. A trigger results in loading the counter
to the preset value.

What: /sys/bus/counter/devices/counterX/countY/count_mode_available
What: /sys/bus/counter/devices/counterX/countY/error_noise_available
What: /sys/bus/counter/devices/counterX/countY/function_available
Expand Down
48 changes: 48 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-cxl
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,54 @@ Description:
affinity for this device.


What: /sys/bus/cxl/devices/memX/security/state
Date: June, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(RO) Reading this file will display the CXL security state for
that device. Such states can be: 'disabled', 'sanitize', when
a sanitization is currently underway; or those available only
for persistent memory: 'locked', 'unlocked' or 'frozen'. This
sysfs entry is select/poll capable from userspace to notify
upon completion of a sanitize operation.


What: /sys/bus/cxl/devices/memX/security/sanitize
Date: June, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(WO) Write a boolean 'true' string value to this attribute to
sanitize the device to securely re-purpose or decommission it.
This is done by ensuring that all user data and meta-data,
whether it resides in persistent capacity, volatile capacity,
or the LSA, is made permanently unavailable by whatever means
is appropriate for the media type. This functionality requires
the device to be not be actively decoding any HPA ranges.


What /sys/bus/cxl/devices/memX/security/erase
Date: June, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(WO) Write a boolean 'true' string value to this attribute to
secure erase user data by changing the media encryption keys for
all user data areas of the device.


What: /sys/bus/cxl/devices/memX/firmware/
Date: April, 2023
KernelVersion: v6.5
Contact: [email protected]
Description:
(RW) Firmware uploader mechanism. The different files under
this directory can be used to upload and activate new
firmware for CXL devices. The interfaces under this are
documented in sysfs-class-firmware.


What: /sys/bus/cxl/devices/*/devtype
Date: June, 2021
KernelVersion: v5.14
Expand Down
10 changes: 10 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-usb
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,16 @@ Description:
which is marked with early_stop has failed to initialize, it will ignore
all future connections until this attribute is clear.

What: /sys/bus/usb/devices/.../<hub_interface>/port<X>/state
Date: June 2023
Contact: Roy Luo <[email protected]>
Description:
Indicates current state of the USB device attached to the port.
Valid states are: 'not-attached', 'attached', 'powered',
'reconnecting', 'unauthenticated', 'default', 'addressed',
'configured', and 'suspended'. This file supports poll() to
monitor the state change from user space.

What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
Date: May 2013
Contact: Mathias Nyman <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/sysfs-class-firmware-attributes
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ Description:

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

certificate, signature, save_signature:
These attributes are used for certificate based authentication. This is
Expand Down
5 changes: 5 additions & 0 deletions Documentation/ABI/testing/sysfs-class-led-driver-aw200xx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
What: /sys/class/leds/<led>/dim
Date: May 2023
Description: 64-level DIM current. If you write a negative value or
"auto", the dim will be calculated according to the
brightness.
Loading

0 comments on commit 2f98e68

Please sign in to comment.