Merge tag 'cgroup-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:

 - cpuset isolation improvements

 - cpuset cgroup1 support is split into its own file behind the new
   config option CONFIG_CPUSET_V1. This makes it the second controller
   which makes cgroup1 support optional after memcg

 - Handling of unavailable v1 controller handling improved during
   cgroup1 mount operations

 - union_find applied to cpuset. It makes code simpler and more
   efficient

 - Reduce spurious events in pids.events

 - Cleanups and other misc changes

 - Contains a merge of cgroup/for-6.11-fixes to receive cpuset fixes
   that further changes build upon

* tag 'cgroup-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (34 commits)
  cgroup: Do not report unavailable v1 controllers in /proc/cgroups
  cgroup: Disallow mounting v1 hierarchies without controller implementation
  cgroup/cpuset: Expose cpuset filesystem with cpuset v1 only
  cgroup/cpuset: Move cpu.h include to cpuset-internal.h
  cgroup/cpuset: add sefltest for cpuset v1
  cgroup/cpuset: guard cpuset-v1 code under CONFIG_CPUSETS_V1
  cgroup/cpuset: rename functions shared between v1 and v2
  cgroup/cpuset: move v1 interfaces to cpuset-v1.c
  cgroup/cpuset: move validate_change_legacy to cpuset-v1.c
  cgroup/cpuset: move legacy hotplug update to cpuset-v1.c
  cgroup/cpuset: add callback_lock helper
  cgroup/cpuset: move memory_spread to cpuset-v1.c
  cgroup/cpuset: move relax_domain_level to cpuset-v1.c
  cgroup/cpuset: move memory_pressure to cpuset-v1.c
  cgroup/cpuset: move common code to cpuset-internal.h
  cgroup/cpuset: introduce cpuset-v1.c
  selftest/cgroup: Make test_cpuset_prs.sh deal with pre-isolated CPUs
  cgroup/cpuset: Account for boot time isolated CPUs
  cgroup/cpuset: remove use_parent_ecpus of cpuset
  cgroup/cpuset: remove fetch_xcpus
  ...

diff --combined Documentation/admin-guide/cgroup-v2.rst
index 95c18bc170834563021f36de595f9b3f4227ed1d,75f8c403f77ac0157917c9cd1b0e7a60e036b391..c65756afd372f7acdd4e4d061415ed1413f5110e
--- 1/Documentation/admin-guide/cgroup-v2.rst
--- 2/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@@ -533,10 -533,12 +533,12 @@@ cgroup namespace on namespace creation
  Because the resource control interface files in a given directory
  control the distribution of the parent's resources, the delegatee
  shouldn't be allowed to write to them.  For the first method, this is
- achieved by not granting access to these files.  For the second, the
- kernel rejects writes to all files other than "cgroup.procs" and
- "cgroup.subtree_control" on a namespace root from inside the
- namespace.
+ achieved by not granting access to these files.  For the second, files
+ outside the namespace should be hidden from the delegatee by the means
+ of at least mount namespacing, and the kernel rejects writes to all
+ files on a namespace root from inside the cgroup namespace, except for
+ those files listed in "/sys/kernel/cgroup/delegate" (including
+ "cgroup.procs", "cgroup.threads", "cgroup.subtree_control", etc.).
  
  The end results are equivalent for both delegation types.  Once
  delegated, the user can build sub-hierarchy under the directory,
@@@ -981,6 -983,14 +983,14 @@@ All cgroup core files are prefixed wit
                A dying cgroup can consume system resources not exceeding
                limits, which were active at the moment of cgroup deletion.
  
+         nr_subsys_<cgroup_subsys>
+               Total number of live cgroup subsystems (e.g memory
+               cgroup) at and beneath the current cgroup.
+ 
+         nr_dying_subsys_<cgroup_subsys>
+               Total number of dying cgroup subsystems (e.g. memory
+               cgroup) at and beneath the current cgroup.
+ 
    cgroup.freeze
        A read-write single value file which exists on non-root cgroups.
        Allowed values are "0" and "1". The default is "0".
@@@ -1717,10 -1727,9 +1727,10 @@@ The following nested keys are defined
        entries fault back in or are written out to disk.
  
    memory.zswap.writeback
 -      A read-write single value file. The default value is "1". The
 -      initial value of the root cgroup is 1, and when a new cgroup is
 -      created, it inherits the current value of its parent.
 +      A read-write single value file. The default value is "1".
 +      Note that this setting is hierarchical, i.e. the writeback would be
 +      implicitly disabled for child cgroups if the upper hierarchy
 +      does so.
  
        When this is set to 0, all swapping attempts to swapping devices
        are disabled. This included both zswap writebacks, and swapping due
@@@ -2940,8 -2949,8 +2950,8 @@@ Deprecated v1 Core Feature
  
  - "cgroup.clone_children" is removed.
  
- - /proc/cgroups is meaningless for v2.  Use "cgroup.controllers" file
-   at the root instead.
+ - /proc/cgroups is meaningless for v2.  Use "cgroup.controllers" or
+   "cgroup.stat" files at the root instead.
  
  
  Issues with v1 and Rationales for v2

diff --combined MAINTAINERS
index 42d2d950877ca6542657704a921e2216ab889b11,b59f54e1e30dc65ce94fc07ef92aa53b9594501e..0035cef79ba577173051306c98b6f6c9012c4a51
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -334,7 -334,6 +334,7 @@@ L: [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/acpi/arm64
 +F:    include/linux/acpi_iort.h
  
  ACPI FOR RISC-V (ACPI/riscv)
  M:    Sunil V L <[email protected]>
@@@ -1154,13 -1153,6 +1154,13 @@@ S:    Supporte
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
  F:    drivers/net/ethernet/amd/xgbe/
  
 +AMLOGIC BLUETOOTH DRIVER
 +M:    Yang Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/amlogic,w155s2-bt.yaml
 +F:    drivers/bluetooth/hci_aml.c
 +
  AMLOGIC DDR PMU DRIVER
  M:    Jiucheng Xu <[email protected]>
  L:    [email protected]
@@@ -1210,13 -1202,6 +1210,13 @@@ W:    https://ez.analog.com/linux-software
  F:    Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
  F:    drivers/iio/dac/ad3552r.c
  
 +ANALOG DEVICES INC AD4000 DRIVER
 +M:    Marcelo Schmitt <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad4000.yaml
 +
  ANALOG DEVICES INC AD4130 DRIVER
  M:    Cosmin Tanislav <[email protected]>
  L:    [email protected]
@@@ -1624,14 -1609,6 +1624,14 @@@ F:    Documentation/admin-guide/perf/xgene
  F:    Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt
  F:    drivers/perf/xgene_pmu.c
  
 +APPLIED MICRO QT2025 PHY DRIVER
 +M:    FUJITA Tomonori <[email protected]>
 +R:    Trevor Gross <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/qt2025.rs
 +
  APTINA CAMERA SENSOR PLL
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -1760,17 -1737,6 +1760,17 @@@ F:    drivers/mtd/maps/physmap-versatile.
  F:    drivers/power/reset/arm-versatile-reboot.c
  F:    drivers/soc/versatile/
  
 +ARM INTERCONNECT PMU DRIVERS
 +M:    Robin Murphy <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/arm-cmn.rst
 +F:    Documentation/admin-guide/perf/arm-ni.rst
 +F:    Documentation/devicetree/bindings/perf/arm,cmn.yaml
 +F:    Documentation/devicetree/bindings/perf/arm,ni.yaml
 +F:    drivers/perf/arm-cmn.c
 +F:    drivers/perf/arm-ni.c
 +F:    tools/perf/pmu-events/arch/arm64/arm/cmn/
 +
  ARM KOMEDA DRM-KMS DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1914,10 -1880,6 +1914,10 @@@ F:    Documentation/devicetree/bindings/io
  F:    drivers/iommu/arm/
  F:    drivers/iommu/io-pgtable-arm*
  
 +ARM SMMU SVA SUPPORT
 +R:    Jean-Philippe Brucker <[email protected]>
 +F:    drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
 +
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2573,7 -2535,8 +2573,7 @@@ L:      [email protected]
  S:    Supported
  W:    http://www.linux4sam.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
 -F:    arch/arm/boot/dts/microchip/at91*
 -F:    arch/arm/boot/dts/microchip/sama*
 +F:    arch/arm/boot/dts/microchip/
  F:    arch/arm/include/debug/at91.S
  F:    arch/arm/mach-at91/
  F:    drivers/memory/atmel*
@@@ -2782,7 -2745,7 +2782,7 @@@ F:      include/linux/soc/qcom
  
  ARM/QUALCOMM SUPPORT
  M:    Bjorn Andersson <[email protected]>
 -M:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +M:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -3541,9 -3504,7 +3541,9 @@@ S:      Maintaine
  W:    http://linux-atm.sourceforge.net
  F:    drivers/atm/
  F:    include/linux/atm*
 +F:    include/linux/sonet.h
  F:    include/uapi/linux/atm*
 +F:    include/uapi/linux/sonet.h
  
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
@@@ -3820,9 -3781,10 +3820,9 @@@ F:     Documentation/filesystems/befs.rs
  F:    fs/befs/
  
  BFQ I/O SCHEDULER
 -M:    Paolo Valente <[email protected]>
 -M:    Jens Axboe <[email protected]>
 +M:    Yu Kuai <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/block/bfq-iosched.rst
  F:    block/bfq-*
  
@@@ -3901,7 -3863,7 +3901,7 @@@ F:      kernel/trace/blktrace.
  F:    lib/sbitmap.c
  
  BLOCK LAYER DEVICE DRIVER API [RUST]
 -M:    Andreas Hindborg <a.hindborg@samsung.com>
 +M:    Andreas Hindborg <a.hindborg@kernel.org>
  R:    Boqun Feng <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5344,7 -5306,7 +5344,7 @@@ F:      drivers/media/cec/i2c/ch7322.
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    David Rhodes <[email protected]>
  M:    Richard Fitzgerald <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
@@@ -5413,7 -5375,7 +5413,7 @@@ F:      sound/soc/codecs/lochnagar-sc.
  CIRRUS LOGIC MADERA CODEC DRIVERS
  M:    Charles Keepax <[email protected]>
  M:    Richard Fitzgerald <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
@@@ -5736,9 -5698,12 +5736,12 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
+ F:    kernel/cgroup/cpuset-internal.h
+ F:    kernel/cgroup/cpuset-v1.c
  F:    kernel/cgroup/cpuset.c
  F:    tools/testing/selftests/cgroup/test_cpuset.c
  F:    tools/testing/selftests/cgroup/test_cpuset_prs.sh
+ F:    tools/testing/selftests/cgroup/test_cpuset_v1_base.sh
  
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <[email protected]>
@@@ -5857,9 -5822,6 +5860,9 @@@ CPU POWER MONITORING SUBSYSTE
  M:    Thomas Renninger <[email protected]>
  M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    John B. Wyatt IV <[email protected]>
 +M:    John B. Wyatt IV <[email protected]>
 +M:    John Kacur <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -5992,7 -5954,6 +5995,7 @@@ F:      Documentation/process/cve.rs
  CW1200 WLAN driver
  S:    Orphan
  F:    drivers/net/wireless/st/cw1200/
 +F:    include/linux/platform_data/net-cw1200.h
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
@@@ -6542,7 -6503,6 +6545,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:    Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
 +F:    Documentation/devicetree/bindings/sound/dlg,da7213.yaml
  F:    Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml
  F:    Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml
  F:    Documentation/hwmon/da90??.rst
@@@ -6754,7 -6714,6 +6757,7 @@@ DOCUMENTATION PROCES
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/dev-tools/
  F:    Documentation/maintainer/
  F:    Documentation/process/
  
@@@ -6762,7 -6721,6 +6765,7 @@@ DOCUMENTATION REPORTING ISSUE
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/bug-bisect.rst
  F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
  F:    Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst
@@@ -7151,7 -7109,7 +7154,7 @@@ F:      drivers/gpu/drm/tiny/panel-mipi-dbi.
  DRM DRIVER for Qualcomm Adreno GPUs
  M:    Rob Clark <[email protected]>
  R:    Sean Paul <[email protected]>
 -R:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +R:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -7497,8 -7455,8 +7500,8 @@@ S:      Maintaine
  T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
 +F:    drivers/gpu/drm/display/drm_bridge_connector.c
  F:    drivers/gpu/drm/drm_bridge.c
 -F:    drivers/gpu/drm/drm_bridge_connector.c
  F:    include/drm/drm_bridge.h
  F:    include/drm/drm_bridge_connector.h
  
@@@ -8384,7 -8342,6 +8387,7 @@@ F:      include/linux/mii.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 +F:    include/linux/phy_link_topology.h
  F:    include/linux/phylib_stubs.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/linux/platform_data/mdio-gpio.h
@@@ -8400,7 -8357,6 +8403,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    rust/kernel/net/phy.rs
 +F:    rust/kernel/net/phy/reg.rs
  
  EXEC & BINFMT API, ELF
  R:    Eric Biederman <[email protected]>
@@@ -8644,7 -8600,6 +8647,7 @@@ M:      Christian Brauner <[email protected]
  R:    Jan Kara <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
  F:    fs/*
  F:    include/linux/fs.h
  F:    include/linux/fs_types.h
@@@ -8907,7 -8862,6 +8910,7 @@@ F:      drivers/dma/fsldma.
  FREESCALE DSPI DRIVER
  M:    Vladimir Oltean <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/fsl,dspi*.yaml
  F:    drivers/spi/spi-fsl-dspi.c
@@@ -8992,14 -8946,6 +8995,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
  
 +FREESCALE IMX LPSPI DRIVER
 +M:    Frank Li <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml
 +F:    drivers/spi/spi-fsl-lpspi.c
 +
  FREESCALE MPC I2C DRIVER
  M:    Chris Packham <[email protected]>
  L:    [email protected]
@@@ -9036,7 -8982,6 +9039,7 @@@ F:      include/linux/fsl/ptp_qoriq.
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml
  F:    drivers/spi/spi-fsl-qspi.c
@@@ -9054,7 -8999,6 +9057,7 @@@ M:      Herve Codina <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml
  F:    drivers/soc/fsl/qe/qmc.c
  F:    include/soc/fsl/qe/qmc.h
  
@@@ -9070,11 -9014,9 +9073,11 @@@ M:    Herve Codina <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml
  F:    drivers/soc/fsl/qe/tsa.c
  F:    drivers/soc/fsl/qe/tsa.h
  F:    include/dt-bindings/soc/cpm1-fsl,tsa.h
 +F:    include/dt-bindings/soc/qe-fsl,tsa.h
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  L:    [email protected]
@@@ -10234,7 -10176,7 +10237,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/infiniband/hw/hns/
  
  HISILICON SAS Controller
 -M:    Xiang Chen <chenxiang66@hisilicon.com>
 +M:    Yihang Li <liyihang9@huawei.com>
  S:    Supported
  W:    http://www.hisilicon.com
  F:    Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
@@@ -11179,16 -11121,6 +11182,16 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    security/integrity/
  F:    security/integrity/ima/
  
 +INTEGRITY POLICY ENFORCEMENT (IPE)
 +M:    Fan Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git https://github.com/microsoft/ipe.git
 +F:    Documentation/admin-guide/LSM/ipe.rst
 +F:    Documentation/security/ipe.rst
 +F:    scripts/ipe/
 +F:    security/ipe/
 +
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
@@@ -11211,12 -11143,12 +11214,12 @@@ F:        drivers/gpio/gpio-i8255.
  
  INTEL ASoC DRIVERS
  M:    Cezary Rojewski <[email protected]>
 -M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
  M:    Peter Ujfalusi <[email protected]>
  M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
  M:    Kai Vehmanen <[email protected]>
 +R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -12064,7 -11996,7 +12067,7 @@@ F:   fs/jfs
  JME NETWORK DRIVER
  M:    Guo-Fu Tseng <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/net/ethernet/jme.*
  
  JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
@@@ -12236,7 -12168,7 +12239,7 @@@ KERNEL NFSD, SUNRPC, AND LOCKD SERVER
  M:    Chuck Lever <[email protected]>
  M:    Jeff Layton <[email protected]>
  R:    Neil Brown <[email protected]>
 -R:    Olga Kornievskaia <kolga@netapp.com>
 +R:    Olga Kornievskaia <okorniev@redhat.com>
  R:    Dai Ngo <[email protected]>
  R:    Tom Talpey <[email protected]>
  L:    [email protected]
@@@ -12363,7 -12295,6 +12366,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    Documentation/virt/kvm/loongarch/
  F:    arch/loongarch/include/asm/kvm*
  F:    arch/loongarch/include/uapi/asm/kvm*
  F:    arch/loongarch/kvm/
@@@ -13396,16 -13327,14 +13399,16 @@@ F:        Documentation/devicetree/bindings/i2
  F:    drivers/i2c/muxes/i2c-mux-ltc4306.c
  
  LTP (Linux Test Project)
 +M:    Andrea Cervesato <[email protected]>
  M:    Cyril Hrubis <[email protected]>
  M:    Jan Stancek <[email protected]>
  M:    Petr Vorel <[email protected]>
  M:    Li Wang <[email protected]>
  M:    Yang Xu <[email protected]>
 +M:    Xiao Yang <[email protected]>
  L:    [email protected] (subscribers-only)
  S:    Maintained
 -W:    http://linux-test-project.github.io/
 +W:    https://linux-test-project.readthedocs.io/
  T:    git https://github.com/linux-test-project/ltp.git
  
  LTR390 AMBIENT/UV LIGHT SENSOR DRIVER
@@@ -13613,7 -13542,7 +13616,7 @@@ MARVELL GIGABIT ETHERNET DRIVERS (skge/
  M:    Mirko Lindner <[email protected]>
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd fixes
  F:    drivers/net/ethernet/marvell/sk*
  
  MARVELL LIBERTAS WIRELESS DRIVER
@@@ -13632,6 -13561,7 +13635,6 @@@ M:   Sebastian Hesselbarth <sebastian.hes
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/marvell/mv643xx_eth.*
 -F:    include/linux/mv643xx.h
  
  MARVELL MV88X3310 PHY DRIVER
  M:    Russell King <[email protected]>
@@@ -14562,7 -14492,7 +14565,7 @@@ MELLANOX ETHERNET DRIVER (mlx4_en
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
@@@ -14571,7 -14501,7 +14574,7 @@@ M:   Saeed Mahameed <[email protected]
  M:    Tariq Toukan <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
@@@ -14579,7 -14509,7 +14582,7 @@@ MELLANOX ETHERNET INNOVA DRIVER
  R:    Boris Pismenny <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
@@@ -14590,7 -14520,7 +14593,7 @@@ M:   Ido Schimmel <[email protected]
  M:    Petr Machata <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxsw/
  F:    tools/testing/selftests/drivers/net/mlxsw/
@@@ -14599,7 -14529,7 +14602,7 @@@ MELLANOX FIRMWARE FLASH LIBRARY (mlxfw
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlxfw/
  
@@@ -14618,7 -14548,7 +14621,7 @@@ M:   Tariq Toukan <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    drivers/net/ethernet/mellanox/mlx4/
  F:    include/linux/mlx4/
@@@ -14627,7 -14557,7 +14630,7 @@@ MELLANOX MLX4 IB drive
  M:    Yishai Hadas <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/hw/mlx4/
  F:    include/linux/mlx4/
@@@ -14640,7 -14570,7 +14643,7 @@@ M:   Tariq Toukan <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  F:    Documentation/networking/device_drivers/ethernet/mellanox/
  F:    drivers/net/ethernet/mellanox/mlx5/core/
@@@ -14650,7 -14580,7 +14653,7 @@@ MELLANOX MLX5 IB drive
  M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://www.mellanox.com
 +W:    https://www.nvidia.com/networking/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/hw/mlx5/
  F:    include/linux/mlx5/
@@@ -14878,7 -14808,6 +14881,7 @@@ M:   Alexander Duyck <[email protected]
  M:    Jakub Kicinski <[email protected]>
  R:    [email protected]
  S:    Supported
 +F:    Documentation/networking/device_drivers/ethernet/meta/
  F:    drivers/net/ethernet/meta/
  
  METHODE UDPU SUPPORT
@@@ -15025,13 -14954,6 +15028,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
 +MICROCHIP LAN8650/1 10BASE-T1S MACPHY ETHERNET DRIVER
 +M:    Parthiban Veerasooran <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/microchip,lan8650.yaml
 +F:    drivers/net/ethernet/microchip/lan865x/lan865x.c
 +
  MICROCHIP LAN87xx/LAN937x T1 PHY DRIVER
  M:    Arun Ramadoss <[email protected]>
  R:    [email protected]
@@@ -15851,7 -15773,6 +15854,7 @@@ M:   Breno Leitao <[email protected]
  S:    Maintained
  F:    Documentation/networking/netconsole.rst
  F:    drivers/net/netconsole.c
 +F:    tools/testing/selftests/drivers/net/netcons_basic.sh
  
  NETDEVSIM
  M:    Jakub Kicinski <[email protected]>
@@@ -15957,21 -15878,15 +15960,21 @@@ F:        drivers/net
  F:    include/dt-bindings/net/
  F:    include/linux/cn_proc.h
  F:    include/linux/etherdevice.h
 +F:    include/linux/ethtool_netlink.h
  F:    include/linux/fcdevice.h
  F:    include/linux/fddidevice.h
  F:    include/linux/hippidevice.h
  F:    include/linux/if_*
  F:    include/linux/inetdevice.h
 -F:    include/linux/netdevice.h
 +F:    include/linux/netdev*
 +F:    include/linux/platform_data/wiznet.h
  F:    include/uapi/linux/cn_proc.h
 +F:    include/uapi/linux/ethtool_netlink.h
  F:    include/uapi/linux/if_*
 -F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/netdev*
 +F:    tools/testing/selftests/drivers/net/
 +X:    Documentation/devicetree/bindings/net/bluetooth/
 +X:    Documentation/devicetree/bindings/net/wireless/
  X:    drivers/net/wireless/
  
  NETWORKING DRIVERS (WIRELESS)
@@@ -16022,28 -15937,13 +16025,28 @@@ F:        include/linux/framer/framer-provider
  F:    include/linux/framer/framer.h
  F:    include/linux/in.h
  F:    include/linux/indirect_call_wrapper.h
 +F:    include/linux/inet.h
 +F:    include/linux/inet_diag.h
  F:    include/linux/net.h
 -F:    include/linux/netdevice.h
 +F:    include/linux/netdev*
 +F:    include/linux/netlink.h
 +F:    include/linux/netpoll.h
 +F:    include/linux/rtnetlink.h
 +F:    include/linux/seq_file_net.h
 +F:    include/linux/skbuff*
  F:    include/net/
 +F:    include/uapi/linux/genetlink.h
 +F:    include/uapi/linux/hsr_netlink.h
  F:    include/uapi/linux/in.h
 +F:    include/uapi/linux/inet_diag.h
 +F:    include/uapi/linux/nbd-netlink.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/net_namespace.h
 -F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/netconf.h
 +F:    include/uapi/linux/netdev*
 +F:    include/uapi/linux/netlink.h
 +F:    include/uapi/linux/netlink_diag.h
 +F:    include/uapi/linux/rtnetlink.h
  F:    lib/net_utils.c
  F:    lib/random32.c
  F:    net/
@@@ -16485,7 -16385,6 +16488,7 @@@ M:   Han Xu <[email protected]
  M:    Haibo Chen <[email protected]>
  R:    Yogesh Gaur <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
  F:    drivers/spi/spi-nxp-fspi.c
@@@ -17165,14 -17064,6 +17168,14 @@@ L: [email protected]
  S:    Supported
  F:    drivers/infiniband/ulp/opa_vnic
  
 +OPEN ALLIANCE 10BASE-T1S MACPHY SERIAL INTERFACE FRAMEWORK
 +M:    Parthiban Veerasooran <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/oa-tc6-framework.rst
 +F:    drivers/include/linux/oa_tc6.h
 +F:    drivers/net/ethernet/oa_tc6.c
 +
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <[email protected]>
  M:    Saravana Kannan <[email protected]>
@@@ -17205,7 -17096,7 +17208,7 @@@ F:   include/dt-bindings
  
  OPENCOMPUTE PTP CLOCK DRIVER
  M:    Jonathan Lemon <[email protected]>
 -M:    Vadim Fedorenko <vadfed@linux.dev>
 +M:    Vadim Fedorenko <vadim.fedorenko@linux.dev>
  L:    [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
@@@ -17524,7 -17415,6 +17527,7 @@@ M:   Roy Zang <[email protected]
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    drivers/pci/controller/dwc/*layerscape*
  
@@@ -17551,7 -17441,6 +17554,7 @@@ M:   Richard Zhu <[email protected]
  M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
@@@ -17730,7 -17619,6 +17733,7 @@@ F:   drivers/pci/controller/pci-xgene-msi
  PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
  M:    Lorenzo Pieralisi <[email protected]>
  M:    Krzysztof Wilczyński <[email protected]>
 +R:    Manivannan Sadhasivam <[email protected]>
  R:    Rob Herring <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -18479,7 -18367,6 +18482,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/pse-pd/
  F:    drivers/net/pse-pd/
 +F:    net/ethtool/pse-pd.c
  
  PSTORE FILESYSTEM
  M:    Kees Cook <[email protected]>
@@@ -18638,6 -18525,7 +18641,6 @@@ F:   drivers/crypto/intel/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
 -M:    Banajit Goswami <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
@@@ -18671,7 -18559,7 +18674,7 @@@ F:   drivers/usb/misc/qcom_eud.
  QCOM IPA DRIVER
  M:    Alex Elder <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ipa/
  
  QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
@@@ -18886,7 -18774,7 +18889,7 @@@ F:   include/uapi/drm/qaic_accel.
  
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
  M:    Bjorn Andersson <[email protected]>
 -M:    Konrad Dybcio <konrad.dybcio@linaro.org>
 +M:    Konrad Dybcio <konradybcio@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -18970,7 -18858,6 +18973,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
  F:    drivers/soc/qcom/icc-bwmon.c
 +F:    drivers/soc/qcom/trace_icc-bwmon.h
  
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
@@@ -19310,7 -19197,6 +19313,7 @@@ S:   Supporte
  W:    https://oss.oracle.com/projects/rds/
  F:    Documentation/networking/rds.rst
  F:    net/rds/
 +F:    tools/testing/selftests/net/rds/
  
  RDT - RESOURCE ALLOCATION
  M:    Fenghua Yu <[email protected]>
@@@ -19813,14 -19699,6 +19816,14 @@@ F: Documentation/ABI/*/sysfs-driver-hid
  F:    drivers/hid/hid-roccat*
  F:    include/linux/hid-roccat*
  
 +ROCKCHIP CAN-FD DRIVER
 +M:    Marc Kleine-Budde <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/rockchip,rk3568v2-canfd.yaml
 +F:    drivers/net/can/rockchip/
 +
  ROCKCHIP CRYPTO DRIVERS
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
@@@ -19847,13 -19725,6 +19850,13 @@@ F: Documentation/userspace-api/media/v4
  F:    drivers/media/platform/rockchip/rkisp1
  F:    include/uapi/linux/rkisp1-config.h
  
 +ROCKCHIP RK3568 RANDOM NUMBER GENERATOR SUPPORT
 +M:    Daniel Golle <[email protected]>
 +M:    Aurelien Jarno <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/rng/rockchip,rk3568-rng.yaml
 +F:    drivers/char/hw_random/rockchip-rng.c
 +
  ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
  M:    Jacob Chen <[email protected]>
  M:    Ezequiel Garcia <[email protected]>
@@@ -19976,13 -19847,6 +19979,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/tty/rpmsg_tty.c
  
 +RTASE ETHERNET DRIVER
 +M:    Justin Lai <[email protected]>
 +M:    Larry Chiu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/realtek/rtase/
 +
  RTL2830 MEDIA DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -20043,11 -19907,12 +20046,11 @@@ F:        tools/verification
  RUST
  M:    Miguel Ojeda <[email protected]>
  M:    Alex Gaynor <[email protected]>
 -M:    Wedson Almeida Filho <[email protected]>
  R:    Boqun Feng <[email protected]>
  R:    Gary Guo <[email protected]>
  R:    Björn Roy Baron <[email protected]>
  R:    Benno Lossin <[email protected]>
 -R:    Andreas Hindborg <a.hindborg@samsung.com>
 +R:    Andreas Hindborg <a.hindborg@kernel.org>
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -20247,16 -20112,6 +20250,16 @@@ B: mailto:[email protected]
  F:    Documentation/devicetree/bindings/sound/samsung*
  F:    sound/soc/samsung/
  
 +SAMSUNG EXYNOS850 SoC SUPPORT
 +M:    Sam Protsenko <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
 +F:    arch/arm64/boot/dts/exynos/exynos850*
 +F:    drivers/clk/samsung/clk-exynos850.c
 +F:    include/dt-bindings/clock/exynos850.h
 +
  SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
@@@ -20499,7 -20354,6 +20502,7 @@@ F:   Documentation/devicetree/bindings/sc
  F:    drivers/scsi/
  F:    drivers/ufs/
  F:    include/scsi/
 +F:    include/uapi/scsi/
  
  SCSI TAPE DRIVER
  M:    Kai Mäkisara <[email protected]>
@@@ -21200,7 -21054,6 +21203,7 @@@ SOCKET TIMESTAMPIN
  M:    Willem de Bruijn <[email protected]>
  S:    Maintained
  F:    Documentation/networking/timestamping.rst
 +F:    include/linux/net_tstamp.h
  F:    include/uapi/linux/net_tstamp.h
  F:    tools/testing/selftests/net/so_txtime.c
  
@@@ -21497,13 -21350,13 +21500,13 @@@ S:        Maintaine
  F:    tools/sound/dapm-graph
  
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
 -M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
  M:    Peter Ujfalusi <[email protected]>
  M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
  M:    Daniel Baluta <[email protected]>
  R:    Kai Vehmanen <[email protected]>
 +R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  W:    https://github.com/thesofproject/linux/
@@@ -21512,7 -21365,7 +21515,7 @@@ F:   sound/soc/sof
  SOUNDWIRE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  M:    Bard Liao <[email protected]>
 -R:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +R:    Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
  R:    Sanyog Kale <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -22726,11 -22579,12 +22729,11 @@@ F:        Documentation/devicetree/bindings/so
  F:    Documentation/devicetree/bindings/sound/ti,tas2562.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tas2770.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml
  F:    Documentation/devicetree/bindings/sound/ti,pcm1681.yaml
  F:    Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tlv320*.yaml
  F:    Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml
 -F:    Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
 -F:    Documentation/devicetree/bindings/sound/tpa6130a2.txt
  F:    include/sound/tas2*.h
  F:    include/sound/tlv320*.h
  F:    include/sound/tpa6130a2-plat.h
@@@ -23320,8 -23174,9 +23323,8 @@@ TQ SYSTEMS BOARD & DRIVER SUPPOR
  L:    [email protected]
  S:    Supported
  W:    https://www.tq-group.com/en/products/tq-embedded/
 -F:    arch/arm/boot/dts/imx*mba*.dts*
 -F:    arch/arm/boot/dts/imx*tqma*.dts*
 -F:    arch/arm/boot/dts/mba*.dtsi
 +F:    arch/arm/boot/dts/nxp/imx/*mba*.dts*
 +F:    arch/arm/boot/dts/nxp/imx/*tqma*.dts*
  F:    arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
@@@ -23606,6 -23461,15 +23609,15 @@@ F: drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
+ UNION-FIND
+ M:    Xavier <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/core-api/union_find.rst
+ F:    Documentation/translations/zh_CN/core-api/union_find.rst
+ F:    include/linux/union_find.h
+ F:    lib/union_find.c
+ 
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  R:    Alim Akhtar <[email protected]>
  R:    Avri Altman <[email protected]>
@@@ -23966,8 -23830,10 +23978,8 @@@ F:  drivers/media/usb/uvc
  F:    include/uapi/linux/uvcvideo.h
  
  USB WEBCAM GADGET
 -M:    Laurent Pinchart <[email protected]>
 -M:    Daniel Scally <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/gadget/function/*uvc*
  F:    drivers/usb/gadget/legacy/webcam.c
  F:    include/uapi/linux/usb/g_uvc.h
@@@ -24918,17 -24784,6 +24930,17 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/arch/x86/
  F:    Documentation/devicetree/bindings/x86/
  F:    arch/x86/
 +F:    tools/testing/selftests/x86
 +
 +X86 CPUID DATABASE
 +M:    Borislav Petkov <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +M:    [email protected]
 +R:    Ahmed S. Darwish <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://x86-cpuid.org
 +F:    tools/arch/x86/kcpuid/cpuid.csv
  
  X86 ENTRY CODE
  M:    Andy Lutomirski <[email protected]>

diff --combined init/Kconfig
index 3b6ca7cce03b17075712234b8c0b3b352c438a5a,8bf091354beae9cb26830af9c3626d94974dfc94..8afb993b09cc60d12cc57ece0ca9a148f897d21e
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1143,6 -1143,19 +1143,19 @@@ config CPUSET
  
          Say N if unsure.
  
+ config CPUSETS_V1
+       bool "Legacy cgroup v1 cpusets controller"
+       depends on CPUSETS
+       default n
+       help
+         Legacy cgroup v1 cpusets controller which has been deprecated by
+         cgroup v2 implementation. The v1 is there for legacy applications
+         which haven't migrated to the new cgroup v2 interface yet. If you
+         do not have any such application then you are completely fine leaving
+         this option disabled.
+ 
+         Say N if unsure.
+ 
  config PROC_PID_CPUSET
        bool "Include legacy /proc/<pid>/cpuset file"
        depends on CPUSETS
@@@ -1687,19 -1700,6 +1700,19 @@@ config IO_URIN
          applications to submit and complete IO through submission and
          completion rings that are shared between the kernel and application.
  
 +config GCOV_PROFILE_URING
 +      bool "Enable GCOV profiling on the io_uring subsystem"
 +      depends on GCOV_KERNEL
 +      help
 +        Enable GCOV profiling on the io_uring subsystem, to facilitate
 +        code coverage testing.
 +
 +        If unsure, say N.
 +
 +        Note that this will have a negative impact on the performance of
 +        the io_uring subsystem, hence this should only be enabled for
 +        specific test purposes.
 +
  config ADVISE_SYSCALLS
        bool "Enable madvise/fadvise syscalls" if EXPERT
        default y
@@@ -1915,7 -1915,6 +1928,7 @@@ config RUS
        depends on !MODVERSIONS
        depends on !GCC_PLUGINS
        depends on !RANDSTRUCT
 +      depends on !SHADOW_CALL_STACK
        depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
        help
          Enables Rust support in the kernel.
@@@ -1933,7 -1932,7 +1946,7 @@@
  config RUSTC_VERSION_TEXT
        string
        depends on RUST
 -      default $(shell,command -v $(RUSTC) >/dev/null 2>&1 && $(RUSTC) --version || echo n)
 +      default "$(shell,$(RUSTC) --version 2>/dev/null)"
  
  config BINDGEN_VERSION_TEXT
        string
@@@ -1941,7 -1940,7 +1954,7 @@@
        # The dummy parameter `workaround-for-0.69.0` is required to support 0.69.0
        # (https://github.com/rust-lang/rust-bindgen/pull/2678). It can be removed when
        # the minimum version is upgraded past that (0.69.1 already fixed the issue).
 -      default $(shell,command -v $(BINDGEN) >/dev/null 2>&1 && $(BINDGEN) --version workaround-for-0.69.0 || echo n)
 +      default "$(shell,$(BINDGEN) --version workaround-for-0.69.0 2>/dev/null)"
  
  #
  # Place an empty function call at each tracepoint site. Can be

diff --combined kernel/fork.c
index c1b343cba5601ca1a1727557a61f4af5881c3652,6ed634f0962132908ad5725408feb1f805550646..d4b2d543f48c72e063e2ef1293e77420e11ea5cc
--- 1/kernel/fork.c
--- 2/kernel/fork.c
+++ b/kernel/fork.c
@@@ -1861,7 -1861,7 +1861,7 @@@ static int copy_signal(unsigned long cl
        prev_cputime_init(&sig->prev_cputime);
  
  #ifdef CONFIG_POSIX_TIMERS
 -      INIT_LIST_HEAD(&sig->posix_timers);
 +      INIT_HLIST_HEAD(&sig->posix_timers);
        hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        sig->real_timer.function = it_real_fn;
  #endif
@@@ -2311,7 -2311,6 +2311,6 @@@ __latent_entropy struct task_struct *co
  #endif
  #ifdef CONFIG_CPUSETS
        p->cpuset_mem_spread_rotor = NUMA_NO_NODE;
-       p->cpuset_slab_spread_rotor = NUMA_NO_NODE;
        seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock);
  #endif
  #ifdef CONFIG_TRACE_IRQFLAGS