Skip to content

Commit

Permalink
Automatic merge of 'master' into merge-test (2024-11-21 21:12)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Nov 21, 2024
2 parents bcf2bbe + 43fb83c commit 14396fb
Show file tree
Hide file tree
Showing 5,187 changed files with 160,596 additions and 71,986 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 .get_maintainer.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Alan Cox <[email protected]>
Christoph Hellwig <[email protected]>
Jeff Kirsher <[email protected]>
Marc Gonzalez <[email protected]>
Ralf Baechle <[email protected]>
6 changes: 6 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexey Klimov <[email protected]> <[email protected]>
Alexey Makhalov <[email protected]> <[email protected]>
Alex Elder <[email protected]>
Alex Elder <[email protected]> <[email protected]>
Expand Down Expand Up @@ -251,6 +252,8 @@ Guru Das Srinagesh <[email protected]> <[email protected]>
Gustavo Padovan <[email protected]>
Gustavo Padovan <[email protected]>
Hanjun Guo <[email protected]> <[email protected]>
Hans Verkuil <[email protected]> <[email protected]>
Hans Verkuil <[email protected]> <[email protected]>
Heiko Carstens <[email protected]> <[email protected]>
Heiko Carstens <[email protected]> <[email protected]>
Heiko Stuebner <[email protected]> <[email protected]>
Expand All @@ -269,6 +272,7 @@ Jack Pham <[email protected]> <[email protected]>
Jaegeuk Kim <[email protected]> <[email protected]>
Jaegeuk Kim <[email protected]> <[email protected]>
Jaegeuk Kim <[email protected]> <[email protected]>
Jai Luthra <[email protected]> <[email protected]>
Jakub Kicinski <[email protected]> <[email protected]>
James Bottomley <jejb@mulgrave.(none)>
James Bottomley <[email protected]>
Expand Down Expand Up @@ -665,6 +669,7 @@ Tomeu Vizoso <[email protected]> <[email protected]>
Thomas Graf <[email protected]>
Thomas Körper <[email protected]> <[email protected]>
Thomas Pedersen <[email protected]>
Thorsten Blum <[email protected]> <[email protected]>
Tiezhu Yang <[email protected]> <[email protected]>
Tingwei Zhang <[email protected]> <[email protected]>
Tirupathi Reddy <[email protected]> <[email protected]>
Expand Down Expand Up @@ -729,6 +734,7 @@ Will Deacon <[email protected]> <[email protected]>
Wolfram Sang <[email protected]> <[email protected]>
Wolfram Sang <[email protected]> <[email protected]>
Yakir Yang <[email protected]> <[email protected]>
Yanteng Si <[email protected]> <[email protected]>
Yusuke Goda <[email protected]>
Zack Rusin <[email protected]> <[email protected]>
Zhu Yanjun <[email protected]> <[email protected]>
16 changes: 16 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
D: Linux/MIPS port
D: Linux/68k hacker
D: AX25 maintainer
D: EDAC-CAVIUM OCTEON maintainer
D: IOC3 ETHERNET DRIVER maintainer
D: NETROM NETWORK LAYER maintainer
D: ROSE NETWORK LAYER maintainer
D: TURBOCHANNEL SUBSYSTEM maintainer
S: Hauptstrasse 19
S: 79837 St. Blasien
S: Germany
Expand Down Expand Up @@ -574,6 +579,9 @@ N: Zach Brown
E: [email protected]
D: maestro pci sound

N: Zefan Li
D: Contribution to control group stuff

N: David Brownell
D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
Expand Down Expand Up @@ -1204,6 +1212,10 @@ S: Dreisbachstrasse 24
S: D-57250 Netphen
S: Germany

N: Florian Fainelli
E: [email protected]
D: DSA

N: Rik Faith
E: [email protected]
D: Future Domain TMC-16x0 SCSI driver (author)
Expand Down Expand Up @@ -3791,6 +3803,10 @@ S: Department of Zoology, University of Washington
S: Seattle, WA 98195-1800
S: USA

N: York Sun
E: [email protected]
D: Freescale DDR EDAC

N: Eugene Surovegin
E: [email protected]
W: https://kernel.ebshome.net/
Expand Down
12 changes: 12 additions & 0 deletions Documentation/ABI/obsolete/sysfs-selinux-user
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
What: /sys/fs/selinux/user
Date: April 2005 (predates git)
KernelVersion: 2.6.12-rc2 (predates git)
Contact: [email protected]
Description:

The selinuxfs "user" node allows userspace to request a list
of security contexts that can be reached for a given SELinux
user from a given starting context. This was used by libselinux
when various login-style programs requested contexts for
users, but libselinux stopped using it in 2020.
Kernel support will be removed no sooner than Dec 2025.
10 changes: 10 additions & 0 deletions Documentation/ABI/stable/sysfs-block
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,13 @@ Description:
[RW] This file is used to control (on/off) the iostats
accounting of the disk.

What: /sys/block/<disk>/queue/iostats_passthrough
Date: October 2024
Contact: [email protected]
Description:
[RW] This file is used to control (on/off) the iostats
accounting of the disk for passthrough commands.


What: /sys/block/<disk>/queue/logical_block_size
Date: May 2009
Expand Down Expand Up @@ -594,6 +601,9 @@ Description:
[RW] Maximum number of kilobytes to read-ahead for filesystems
on this block device.

For MADV_HUGEPAGE, the readahead size may exceed this setting
since its granularity is based on the hugepage size.


What: /sys/block/<disk>/queue/rotational
Date: January 2009
Expand Down
7 changes: 7 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-hpre
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,10 @@ Date: Apr 2020
Contact: [email protected]
Description: Dump the total number of time out requests.
Available for both PF and VF, and take no other effect on HPRE.

What: /sys/kernel/debug/hisi_hpre/<bdf>/cap_regs
Date: Oct 2024
Contact: [email protected]
Description: Dump the values of the qm and hpre capability bit registers and
support the query of device specifications to facilitate fault locating.
Available for both PF and VF, and take no other effect on HPRE.
7 changes: 7 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-sec
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,10 @@ Contact: [email protected]
Description: Dump the total number of completed but marked error requests
to be received.
Available for both PF and VF, and take no other effect on SEC.

What: /sys/kernel/debug/hisi_sec2/<bdf>/cap_regs
Date: Oct 2024
Contact: [email protected]
Description: Dump the values of the qm and sec capability bit registers and
support the query of device specifications to facilitate fault locating.
Available for both PF and VF, and take no other effect on SEC.
7 changes: 7 additions & 0 deletions Documentation/ABI/testing/debugfs-hisi-zip
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,10 @@ Contact: [email protected]
Description: Dump the total number of BD type error requests
to be received.
Available for both PF and VF, and take no other effect on ZIP.

What: /sys/kernel/debug/hisi_zip/<bdf>/cap_regs
Date: Oct 2024
Contact: [email protected]
Description: Dump the values of the qm and zip capability bit registers and
support the query of device specifications to facilitate fault locating.
Available for both PF and VF, and take no other effect on ZIP.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
What: /sys/bus/platform/drivers/amd_x3d_vcache/AMDI0101:00/amd_x3d_mode
Date: November 2024
KernelVersion: 6.13
Contact: Basavaraj Natikar <[email protected]>
Description: (RW) AMD 3D V-Cache optimizer allows users to switch CPU core
rankings dynamically.

This file switches between these two modes:
- "frequency" cores within the faster CCD are prioritized before
those in the slower CCD.
- "cache" cores within the larger L3 CCD are prioritized before
those in the smaller L3 CCD.
3 changes: 2 additions & 1 deletion Documentation/ABI/testing/sysfs-class-firmware-attributes
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Description:

mechanism:
The means of authentication. This attribute is mandatory.
Only supported type currently is "password".
Supported types are "password" or "certificate".

max_password_length:
A file that can be read to obtain the
Expand Down Expand Up @@ -303,6 +303,7 @@ Description:
being configured allowing anyone to make changes.
After any of these operations the system must reboot for the changes to
take effect.
Admin and System certificates are supported from 2025 systems onward.

certificate_thumbprint:
Read only attribute used to display the MD5, SHA1 and SHA256 thumbprints
Expand Down
45 changes: 45 additions & 0 deletions Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,48 @@ Description:
indicates a lane.
crc_err_cnt: (RO) CRC err count on this port.
============= ==== =============================================

What: /sys/devices/platform/HISI04Bx:00/used_types
Date: August 2024
KernelVersion: 6.12
Contact: Huisong Li <[email protected]>
Description:
This interface is used to show all HCCS types used on the
platform, like, HCCS-v1, HCCS-v2 and so on.

What: /sys/devices/platform/HISI04Bx:00/available_inc_dec_lane_types
What: /sys/devices/platform/HISI04Bx:00/dec_lane_of_type
What: /sys/devices/platform/HISI04Bx:00/inc_lane_of_type
Date: August 2024
KernelVersion: 6.12
Contact: Huisong Li <[email protected]>
Description:
These interfaces under /sys/devices/platform/HISI04Bx/ are
used to support the low power consumption feature of some
HCCS types by changing the number of lanes used. The interfaces
changing the number of lanes used are 'dec_lane_of_type' and
'inc_lane_of_type' which require root privileges. These
interfaces aren't exposed if no HCCS type on platform support
this feature. Please note that decreasing lane number is only
allowed if all the specified HCCS ports are not busy.

The low power consumption interfaces are as follows:

============================= ==== ================================
available_inc_dec_lane_types: (RO) available HCCS types (string) to
increase and decrease the number
of lane used, e.g. HCCS-v2.
dec_lane_of_type: (WO) input HCCS type supported
decreasing lane to decrease the
used lane number of all specified
HCCS type ports on platform to
the minimum.
You can query the 'cur_lane_num'
to get the minimum lane number
after executing successfully.
inc_lane_of_type: (WO) input HCCS type supported
increasing lane to increase the
used lane number of all specified
HCCS type ports on platform to
the full lane state.
============================= ==== ================================
38 changes: 38 additions & 0 deletions Documentation/ABI/testing/sysfs-driver-hid-corsair-void
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/fw_version_headset
Date: January 2024
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (R) The firmware version of the headset
* Returns -ENODATA if no version was reported

What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/fw_version_receiver
Date: January 2024
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (R) The firmware version of the receiver

What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/microphone_up
Date: July 2023
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (R) Get the physical position of the microphone
* 1 -> Microphone up
* 0 -> Microphone down

What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/send_alert
Date: July 2023
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (W) Play a built-in notification from the headset (0 / 1)

What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/set_sidetone
Date: December 2023
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (W) Set the sidetone volume (0 - sidetone_max)

What: /sys/bus/hid/drivers/hid-corsair-void/<dev>/sidetone_max
Date: July 2024
KernelVersion: 6.13
Contact: Stuart Hayhurst <[email protected]>
Description: (R) Report the maximum sidetone volume
20 changes: 20 additions & 0 deletions Documentation/ABI/testing/sysfs-driver-spi-intel
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
What: /sys/devices/.../intel_spi_protected
Date: Feb 2025
KernelVersion: 6.13
Contact: Alexander Usyskin <[email protected]>
Description: This attribute allows the userspace to check if the
Intel SPI flash controller is write protected from the host.

What: /sys/devices/.../intel_spi_locked
Date: Feb 2025
KernelVersion: 6.13
Contact: Alexander Usyskin <[email protected]>
Description: This attribute allows the user space to check if the
Intel SPI flash controller locks supported opcodes.

What: /sys/devices/.../intel_spi_bios_locked
Date: Feb 2025
KernelVersion: 6.13
Contact: Alexander Usyskin <[email protected]>
Description: This attribute allows the user space to check if the
Intel SPI flash controller BIOS region is locked for writes.
2 changes: 1 addition & 1 deletion Documentation/RCU/stallwarn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ ticks this GP)" indicates that this CPU has not taken any scheduling-clock
interrupts during the current stalled grace period.

The "idle=" portion of the message prints the dyntick-idle state.
The hex number before the first "/" is the low-order 12 bits of the
The hex number before the first "/" is the low-order 16 bits of the
dynticks counter, which will have an even-numbered value if the CPU
is in dyntick-idle mode and an odd-numbered value otherwise. The hex
number between the two "/"s is the value of the nesting, which will be
Expand Down
21 changes: 21 additions & 0 deletions Documentation/admin-guide/bug-bisect.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,27 @@ a fully reliable and straight-forward way to reproduce the regression, too.*
With that the process is complete. Now report the regression as described by
Documentation/admin-guide/reporting-issues.rst.

Bisecting linux-next
--------------------

If you face a problem only happening in linux-next, bisect between the
linux-next branches 'stable' and 'master'. The following commands will start
the process for a linux-next tree you added as a remote called 'next'::

git bisect start
git bisect good next/stable
git bisect bad next/master

The 'stable' branch refers to the state of linux-mainline that the current
linux-next release (found in the 'master' branch) is based on -- the former
thus should be free of any problems that show up in -next, but not in Linus'
tree.

This will bisect across a wide range of changes, some of which you might have
used in earlier linux-next releases without problems. Sadly there is no simple
way to avoid checking them: bisecting from one linux-next release to a later
one (say between 'next-20241020' and 'next-20241021') is impossible, as they
share no common history.

Additional reading material
---------------------------
Expand Down
11 changes: 10 additions & 1 deletion Documentation/admin-guide/cgroup-v2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,15 @@ The following nested keys are defined.
pglazyfreed (npn)
Amount of reclaimed lazyfree pages

swpin_zero
Number of pages swapped into memory and filled with zero, where I/O
was optimized out because the page content was detected to be zero
during swapout.

swpout_zero
Number of zero-filled pages swapped out with I/O skipped due to the
content being detected as zero.

zswpin
Number of pages moved in to memory from zswap.

Expand Down Expand Up @@ -2945,7 +2954,7 @@ following two functions.
a queue (device) has been associated with the bio and
before submission.

wbc_account_cgroup_owner(@wbc, @page, @bytes)
wbc_account_cgroup_owner(@wbc, @folio, @bytes)
Should be called for each data segment being written out.
While this function doesn't care exactly when it's called
during the writeback session, it's the easiest and most
Expand Down
Loading

0 comments on commit 14396fb

Please sign in to comment.