]> Git Repo - linux.git/commitdiff
Merge tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <[email protected]>
Fri, 3 Nov 2023 02:15:30 +0000 (16:15 -1000)
committerLinus Torvalds <[email protected]>
Fri, 3 Nov 2023 02:15:30 +0000 (16:15 -1000)
Pull crypto updates from Herbert Xu:
 "API:
   - Add virtual-address based lskcipher interface
   - Optimise ahash/shash performance in light of costly indirect calls
   - Remove ahash alignmask attribute

  Algorithms:
   - Improve AES/XTS performance of 6-way unrolling for ppc
   - Remove some uses of obsolete algorithms (md4, md5, sha1)
   - Add FIPS 202 SHA-3 support in pkcs1pad
   - Add fast path for single-page messages in adiantum
   - Remove zlib-deflate

  Drivers:
   - Add support for S4 in meson RNG driver
   - Add STM32MP13x support in stm32
   - Add hwrng interface support in qcom-rng
   - Add support for deflate algorithm in hisilicon/zip"

* tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (283 commits)
  crypto: adiantum - flush destination page before unmapping
  crypto: testmgr - move pkcs1pad(rsa,sha3-*) to correct place
  Documentation/module-signing.txt: bring up to date
  module: enable automatic module signing with FIPS 202 SHA-3
  crypto: asymmetric_keys - allow FIPS 202 SHA-3 signatures
  crypto: rsa-pkcs1pad - Add FIPS 202 SHA-3 support
  crypto: FIPS 202 SHA-3 register in hash info for IMA
  x509: Add OIDs for FIPS 202 SHA-3 hash and signatures
  crypto: ahash - optimize performance when wrapping shash
  crypto: ahash - check for shash type instead of not ahash type
  crypto: hash - move "ahash wrapping shash" functions to ahash.c
  crypto: talitos - stop using crypto_ahash::init
  crypto: chelsio - stop using crypto_ahash::init
  crypto: ahash - improve file comment
  crypto: ahash - remove struct ahash_request_priv
  crypto: ahash - remove crypto_ahash_alignmask
  crypto: gcm - stop using alignmask of ahash
  crypto: chacha20poly1305 - stop using alignmask of ahash
  crypto: ccm - stop using alignmask of ahash
  net: ipv6: stop checking crypto_ahash_alignmask
  ...

1  2 
MAINTAINERS
certs/Kconfig
crypto/asymmetric_keys/public_key.c
fs/crypto/keysetup_v1.c
fs/ubifs/ubifs.h
net/mptcp/subflow.c

diff --combined MAINTAINERS
index b4046e7097874006be806475dc119877c1ea137f,d7f30402abc7479e92f3a1d14237544c30f3723b..7ddf1db587c1a193604ce83079ba24347131f3e6
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -908,7 -908,7 +908,7 @@@ F: drivers/crypto/ccp
  F:    include/linux/ccp.h
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - SEV SUPPORT
- M:    Brijesh Singh <brijesh.singh@amd.com>
+ M:    Ashish Kalra <ashish.kalra@amd.com>
  M:    Tom Lendacky <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1460,6 -1460,7 +1460,6 @@@ F:      drivers/hwmon/applesmc.
  APPLETALK NETWORK LAYER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/appletalk/
  F:    include/linux/atalk.h
  F:    include/uapi/linux/atalk.h
  F:    net/appletalk/
@@@ -1584,17 -1585,6 +1584,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1636,13 -1626,13 +1636,13 @@@ F:   drivers/gpu/drm/arm/display/include
  F:    drivers/gpu/drm/arm/display/komeda/
  
  ARM MALI PANFROST DRM DRIVER
 +M:    Boris Brezillon <[email protected]>
  M:    Rob Herring <[email protected]>
 -M:    Tomeu Vizoso <[email protected]>
  R:    Steven Price <[email protected]>
 -R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/panfrost.rst
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1672,7 -1662,7 +1672,7 @@@ F:      arch/arm*/include/asm/perf_event.
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
  F:    drivers/perf/
 -F:    include/linux/perf/arm_pmu.h
 +F:    include/linux/perf/arm_pmu*.h
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1798,7 -1788,7 +1798,7 @@@ F:      drivers/irqchip/irq-owl-sirq.
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
 -F:    drivers/soc/actions/
 +F:    drivers/pmdomain/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
@@@ -1826,13 -1816,6 +1826,13 @@@ N:    allwinne
  N:    sun[x456789]i
  N:    sun[25]0i
  
 +ARM/AMD PENSANDO ARM64 ARCHITECTURE
 +M:    Brad Larson <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/*/amd,pensando*
 +F:    arch/arm64/boot/dts/amd/elba*
 +
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <[email protected]>
  M:    Jerome Brunet <[email protected]>
@@@ -1872,7 -1855,7 +1872,7 @@@ F:      Documentation/devicetree/bindings/ph
  F:    arch/arm/boot/dts/amlogic/
  F:    arch/arm/mach-meson/
  F:    arch/arm64/boot/dts/amlogic/
 -F:    drivers/genpd/amlogic/
 +F:    drivers/pmdomain/amlogic/
  F:    drivers/mmc/host/meson*
  F:    drivers/phy/amlogic/
  F:    drivers/pinctrl/meson/
@@@ -1935,7 -1918,7 +1935,7 @@@ F:      drivers/bluetooth/hci_bcm4377.
  F:    drivers/clk/clk-apple-nco.c
  F:    drivers/cpufreq/apple-soc-cpufreq.c
  F:    drivers/dma/apple-admac.c
 -F:    drivers/genpd/apple/
 +F:    drivers/pmdomain/apple/
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -1980,12 -1963,12 +1980,12 @@@ F:   drivers/irqchip/irq-aspeed-i2c-ic.
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -R:    Andrew Jeffery <andrew@aj.id.au>
 +R:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
  F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed/
  F:    arch/arm/mach-aspeed/
@@@ -2228,28 -2211,21 +2228,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2351,7 -2327,7 +2351,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -2459,7 -2435,7 +2459,7 @@@ F:      arch/arm/mach-ux500
  F:    drivers/clk/clk-nomadik.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
  F:    drivers/dma/ste_dma40*
 -F:    drivers/genpd/st/ste-ux500-pm-domain.c
 +F:    drivers/pmdomain/st/ste-ux500-pm-domain.c
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
  F:    drivers/iio/adc/ab8500-gpadc.c
@@@ -2622,7 -2598,7 +2622,7 @@@ F:      arch/arm/include/debug/renesas-scif.
  F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    arch/riscv/boot/dts/renesas/
 -F:    drivers/genpd/renesas/
 +F:    drivers/pmdomain/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  K:    \brenesas,
@@@ -3082,7 -3058,7 +3082,7 @@@ F:      Documentation/devicetree/bindings/pe
  F:    drivers/peci/controller/peci-aspeed.c
  
  ASPEED PINCTRL DRIVERS
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3099,7 -3075,7 +3099,7 @@@ F:      drivers/irqchip/irq-aspeed-scu-ic.
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
  ASPEED SD/MMC DRIVER
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3368,7 -3344,7 +3368,7 @@@ AX.25 NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/ax25.h
  F:    include/uapi/linux/ax25.h
  F:    net/ax25/
@@@ -3488,14 -3464,6 +3488,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <[email protected]>
 +R:    Brian Foster <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
@@@ -3628,10 -3596,9 +3628,10 @@@ F:    Documentation/devicetree/bindings/ii
  F:    drivers/iio/accel/bma400*
  
  BPF JIT for ARM
 -M:    Shubham Bansal <[email protected]>
 +M:    Russell King <[email protected]>
 +M:    Puranjay Mohan <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Maintained
  F:    arch/arm/net/
  
  BPF JIT for ARM64
  S:    Odd Fixes
  K:    (?:\b|_)bpf(?:\b|_)
  
 +BPF [NETKIT] (BPF-programmable network device)
 +M:    Daniel Borkmann <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/netkit.c
 +F:    include/net/netkit.h
 +
  BPF [NETWORKING] (struct_ops, reuseport)
  M:    Martin KaFai Lau <[email protected]>
  L:    [email protected]
@@@ -4068,7 -4026,7 +4068,7 @@@ F:      arch/mips/kernel/*bmips
  F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 -F:    drivers/genpd/bcm/bcm63xx-power.c
 +F:    drivers/pmdomain/bcm/bcm63xx-power.c
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
@@@ -4124,7 -4082,7 +4124,7 @@@ F:      drivers/net/wireless/broadcom/brcm80
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
 -M:    Florian Fainelli <florian.fainelli@broadcom>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@@ -4290,7 -4248,7 +4290,7 @@@ R:      Broadcom internal kernel review lis
  L:    [email protected]
  S:    Maintained
  T:    git https://github.com/broadcom/stblinux.git
 -F:    drivers/genpd/bcm/bcm-pmb.c
 +F:    drivers/pmdomain/bcm/bcm-pmb.c
  F:    include/dt-bindings/soc/bcm-pmb.h
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@@ -4362,7 -4320,8 +4362,7 @@@ F:      drivers/net/ethernet/broadcom/bcmsys
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <[email protected]>
 -M:    Prashant Sreedharan <[email protected]>
 +M:    Pavan Chebbi <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4419,6 -4378,7 +4419,6 @@@ M:      David Sterba <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://btrfs.readthedocs.io
 -W:    https://btrfs.wiki.kernel.org/
  Q:    https://patchwork.kernel.org/project/linux-btrfs/list/
  C:    irc://irc.libera.chat/btrfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
@@@ -4835,13 -4795,6 +4835,13 @@@ X:    drivers/char/ipmi
  X:    drivers/char/random.c
  X:    drivers/char/tpm/
  
 +CHARGERLAB POWER-Z HARDWARE MONITOR DRIVER
 +M:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/powerz.rst
 +F:    drivers/hwmon/powerz.c
 +
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
  M:    Joe Perches <[email protected]>
@@@ -4959,7 -4912,6 +4959,7 @@@ F:      drivers/spi/spi-cs42l43
  F:    include/dt-bindings/sound/cs*
  F:    include/linux/mfd/cs42l43*
  F:    include/sound/cs*
 +F:    sound/pci/hda/cirrus*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
@@@ -5099,14 -5051,6 +5099,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
@@@ -5252,12 -5196,6 +5252,12 @@@ S:    Orpha
  W:    http://accessrunner.sourceforge.net/
  F:    drivers/usb/atm/cxacru.c
  
 +CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
 +M:    Elena Reshetova <[email protected]>
 +M:    Carlos Bilbao <[email protected]>
 +S:    Maintained
 +F:    Documentation/security/snp-tdx-threat-model.rst
 +
  CONFIGFS
  M:    Joel Becker <[email protected]>
  M:    Christoph Hellwig <[email protected]>
@@@ -5372,6 -5310,12 +5372,6 @@@ M:     Bence Csókás <[email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cp2615.c
  
 -CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/cpmac.c
 -
  CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <[email protected]>
  M:    Sudeep Holla <[email protected]>
@@@ -5655,7 -5599,7 +5655,7 @@@ M:      Andrew Donnellan <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/ABI/testing/sysfs-class-cxl
 -F:    Documentation/powerpc/cxl.rst
 +F:    Documentation/arch/powerpc/cxl.rst
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
  F:    drivers/misc/cxl/
  F:    include/misc/cxl*
@@@ -5667,7 -5611,7 +5667,7 @@@ M:      Matthew R. Ochs <[email protected]
  M:    Uma Krishnan <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/powerpc/cxlflash.rst
 +F:    Documentation/arch/powerpc/cxlflash.rst
  F:    drivers/scsi/cxlflash/
  F:    include/uapi/scsi/cxlflash_ioctl.h
  
@@@ -6042,9 -5986,8 +6042,9 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Mikulas Patocka <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6173,11 -6116,11 +6173,11 @@@ F:   drivers/video/fbdev/udlfb.
  F:    include/video/udlfb.h
  
  DISTRIBUTED LOCK MANAGER (DLM)
 -M:    Christine Caulfield <ccaulfie@redhat.com>
 +M:    Alexander Aring <aahringo@redhat.com>
  M:    David Teigland <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://sources.redhat.com/cluster/
 +W:    https://pagure.io/dlm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  F:    fs/dlm/
  
@@@ -6190,7 -6133,6 +6190,7 @@@ L:      [email protected] (mode
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/driver-api/dma-buf.rst
 +F:    Documentation/userspace-api/dma-buf-alloc-exchange.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
  F:    include/linux/dma-buf.h
@@@ -6393,17 -6335,6 +6393,17 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 +DPLL SUBSYSTEM
 +M:    Vadim Fedorenko <[email protected]>
 +M:    Arkadiusz Kubalewski <[email protected]>
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/driver-api/dpll.rst
 +F:    drivers/dpll/*
 +F:    include/linux/dpll.h
 +F:    include/uapi/linux/dpll.h
 +
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
@@@ -6683,7 -6614,6 +6683,7 @@@ S:      Maintaine
  B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
 +F:    drivers/gpu/drm/ci/xfails/msm*
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
  
@@@ -6716,9 -6646,9 +6716,9 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-novatek-nt36672a.c
  
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 -M:    Ben Skeggs <[email protected]>
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6819,7 -6749,7 +6819,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 -R:    Ondrej Jirman <meg[email protected]>
 +R:    Ondrej Jirman <meg[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -6835,8 -6765,7 +6835,8 @@@ DRM DRIVER FOR SOLOMON SSD130X OLED DIS
  M:    Javier Martinez Canillas <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
  F:    drivers/gpu/drm/solomon/ssd130x*
  
  DRM DRIVER FOR ST-ERICSSON MCDE
@@@ -6931,26 -6860,12 +6931,26 @@@ M:   Thomas Zimmermann <tzimmermann@suse.
  S:    Maintained
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/*
 +F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 -F:    include/drm/drm*
 +F:    include/drm/drm
  F:    include/linux/vga*
 -F:    include/uapi/drm/drm*
 +F:    include/uapi/drm/
 +X:    drivers/gpu/drm/amd/
 +X:    drivers/gpu/drm/armada/
 +X:    drivers/gpu/drm/etnaviv/
 +X:    drivers/gpu/drm/exynos/
 +X:    drivers/gpu/drm/i915/
 +X:    drivers/gpu/drm/kmb/
 +X:    drivers/gpu/drm/mediatek/
 +X:    drivers/gpu/drm/msm/
 +X:    drivers/gpu/drm/nouveau/
 +X:    drivers/gpu/drm/radeon/
 +X:    drivers/gpu/drm/renesas/
 +X:    drivers/gpu/drm/tegra/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6971,7 -6886,6 +6971,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
  F:    Documentation/gpu/meson.rst
 +F:    drivers/gpu/drm/ci/xfails/meson*
  F:    drivers/gpu/drm/meson/
  
  DRM DRIVERS FOR ATMEL HLCDC
@@@ -6995,9 -6909,7 +6995,9 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  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
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -7021,12 -6933,10 +7021,12 @@@ F:   Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    drivers/gpu/drm/fsl-dcu/
  
 -DRM DRIVERS FOR FREESCALE IMX
 +DRM DRIVERS FOR FREESCALE IMX 5/6
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +T:    git git://git.pengutronix.de/git/pza/linux
  F:    Documentation/devicetree/bindings/display/imx/
  F:    drivers/gpu/drm/imx/ipuv3/
  F:    drivers/gpu/ipu-v3/
@@@ -7045,7 -6955,7 +7045,7 @@@ DRM DRIVERS FOR GMA500 (Poulsbo, Moores
  M:    Patrik Jakobsson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://github.com/patjak/drm-gma500
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
@@@ -7084,7 -6994,6 +7084,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
 +F:    drivers/gpu/drm/ci/xfails/mediatek*
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
@@@ -7125,7 -7034,6 +7125,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/rockchip/
 +F:    drivers/gpu/drm/ci/xfails/rockchip*
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
@@@ -7222,7 -7130,7 +7222,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
 -M:    Luben Tuikov <luben.tuikov@amd.com>
 +M:    Luben Tuikov <ltuikov89@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7231,7 -7139,6 +7231,7 @@@ F:      include/drm/gpu_scheduler.
  
  DRM PANEL DRIVERS
  M:    Neil Armstrong <[email protected]>
 +R:    Jessica Zhang <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8187,7 -8094,7 +8187,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8218,7 -8125,7 +8218,7 @@@ M:      Geoffrey D. Bennett <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 -F:    sound/usb/mixer_scarlett_gen2.c
 +F:    sound/usb/mixer_scarlett2.c
  
  FORCEDETH GIGABIT ETHERNET DRIVER
  M:    Rain River <[email protected]>
@@@ -8709,8 -8616,6 +8709,8 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
 +F:    include/linux/stackleak.h
 +F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8824,14 -8729,7 +8824,14 @@@ M:    Ulf Hansson <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
 -F:    drivers/genpd/
 +F:    drivers/pmdomain/
 +
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <[email protected]>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
  
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
@@@ -8977,7 -8875,7 +8977,7 @@@ F:      drivers/gpio/gpio-mockup.
  F:    tools/testing/selftests/gpio/
  
  GPIO REGMAP
 -R:    Michael Walle <[email protected]>
 +M:    Michael Walle <[email protected]>
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
@@@ -9169,7 -9067,6 +9169,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/accel/habanalabs/
 +F:    include/linux/habanalabs/
  F:    include/trace/events/habanalabs.h
  F:    include/uapi/drm/habanalabs_accel.h
  
@@@ -9635,8 -9532,10 +9635,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10036,6 -9935,12 +10036,6 @@@ F:   Documentation/driver-api/i3
  F:    drivers/i3c/
  F:    include/linux/i3c/
  
 -IA64 (Itanium) PLATFORM
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/arch/ia64/
 -F:    arch/ia64/
 -
  IBM Operation Panel Input Driver
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -10531,6 -10436,7 +10531,6 @@@ F:   drivers/platform/x86/intel/atomisp2/
  
  INTEL BIOS SAR INT1092 DRIVER
  M:    Shravan Sudhakar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel/int1092/
@@@ -10570,7 -10476,6 +10570,7 @@@ C:   irc://irc.oftc.net/intel-gf
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
  F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/ci/xfails/i915*
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -10781,7 -10702,7 +10781,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -10961,6 -10882,7 +10961,6 @@@ F:   drivers/platform/x86/intel/wmi/thund
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wwan/iosm/
@@@ -11142,7 -11064,7 +11142,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11161,6 -11083,7 +11161,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -11221,6 -11144,7 +11221,6 @@@ M:   Sagi Grimberg <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.linux-iscsi.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
  F:    drivers/infiniband/ulp/isert
  
@@@ -11470,20 -11394,16 +11470,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <[email protected]>
 +R:    Gustavo A. R. Silva <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
 +F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
 +F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 +K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -11604,18 -11524,6 +11604,18 @@@ F: include/kvm/arm_
  F:    tools/testing/selftests/kvm/*/aarch64/
  F:    tools/testing/selftests/kvm/aarch64/
  
 +KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)
 +M:    Tianrui Zhao <[email protected]>
 +M:    Bibo Mao <[email protected]>
 +M:    Huacai Chen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 +F:    arch/loongarch/include/asm/kvm*
 +F:    arch/loongarch/include/uapi/asm/kvm*
 +F:    arch/loongarch/kvm/
 +
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    Huacai Chen <[email protected]>
  L:    [email protected]
@@@ -11652,7 -11560,6 +11652,7 @@@ F:   arch/riscv/include/asm/kvm
  F:    arch/riscv/include/uapi/asm/kvm*
  F:    arch/riscv/kvm/
  F:    tools/testing/selftests/kvm/*/riscv/
 +F:    tools/testing/selftests/kvm/riscv/
  
  KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
  M:    Christian Borntraeger <[email protected]>
@@@ -12190,7 -12097,7 +12190,7 @@@ F:   Documentation/ABI/stable/sysfs-firmw
  F:    Documentation/devicetree/bindings/i2c/i2c-opal.txt
  F:    Documentation/devicetree/bindings/powerpc/
  F:    Documentation/devicetree/bindings/rtc/rtc-opal.txt
 -F:    Documentation/powerpc/
 +F:    Documentation/arch/powerpc/
  F:    arch/powerpc/
  F:    drivers/*/*/*pasemi*
  F:    drivers/*/*pasemi*
@@@ -12546,14 -12453,6 +12546,14 @@@ F: drivers/hwmon/ltc2947-i2c.
  F:    drivers/hwmon/ltc2947-spi.c
  F:    drivers/hwmon/ltc2947.h
  
 +LTC2991 HARDWARE MONITOR DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
 +F:    drivers/hwmon/ltc2991.c
 +
  LTC2983 IIO TEMPERATURE DRIVER
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
@@@ -13605,6 -13504,7 +13605,6 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK T7XX 5G WWAN MODEM DRIVER
  M:    Chandrashekar Devegowda <[email protected]>
 -M:    Intel Corporation <[email protected]>
  R:    Chiranjeevi Rapolu <[email protected]>
  R:    Liu Haijun <[email protected]>
  R:    M Chetan Kumar <[email protected]>
@@@ -13625,7 -13525,7 +13625,7 @@@ F:   drivers/usb/mtu3
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
 -M:    Martin Donnelly <martin.donnell[email protected]>
 +M:    Ian Ray <ian.ra[email protected]>
  M:    Martyn Welch <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
@@@ -13635,7 -13535,6 +13635,7 @@@ MEGARAID SCSI/SAS DRIVER
  M:    Kashyap Desai <[email protected]>
  M:    Sumit Saxena <[email protected]>
  M:    Shivasharan S <[email protected]>
 +M:    Chandrakanth patil <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -13718,7 -13617,6 +13718,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
@@@ -13949,10 -13847,9 +13949,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14131,7 -14028,7 +14131,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/mcp3911.c
  
  MICROCHIP MMC/SD/SDIO MCI DRIVER
 -M:    Ludovic Desroches <ludovic.desroche[email protected]>
 +M:    Aubin Constans <aubin.constan[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
@@@ -14314,7 -14211,6 +14314,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -14450,11 -14346,9 +14450,11 @@@ MIPS/LOONGSON1 ARCHITECTUR
  M:    Keguang Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/*/loongson,ls1*.yaml
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
  F:    drivers/*/*loongson1*
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <[email protected]>
@@@ -14482,11 -14376,6 +14482,11 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-miropcm20*
  
 +MITSUMI MM8013 FG DRIVER
 +M:    Konrad Dybcio <[email protected]>
 +F:    Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
 +F:    drivers/power/supply/mm8013.c
 +
  MMP SUPPORT
  R:    Lubomir Rintel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/kmod.h
 -F:    include/linux/module.h
 +F:    include/linux/module*.h
  F:    kernel/module/
  F:    lib/test_kmod.c
  F:    scripts/module*
@@@ -14868,7 -14757,7 +14868,7 @@@ NETROM NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/netrom.h
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
@@@ -15057,7 -14946,7 +15057,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15066,11 -14955,10 +15066,11 @@@ W:        https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 +F:    Documentation/netlink/specs/mptcp.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
 -F:    include/uapi/linux/mptcp.h
 +F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
  F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
@@@ -15243,7 -15131,7 +15243,7 @@@ NOLIBC HEADER FIL
  M:    Willy Tarreau <[email protected]>
  M:    Thomas Weißschuh <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -15463,7 -15351,6 +15463,7 @@@ M:   Laurentiu Palcu <laurentiu.palcu@oss
  R:    Lucas Stach <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
@@@ -15536,7 -15423,7 +15536,7 @@@ NXP TFA9879 DRIVE
  M:    Peter Rosin <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/sound/tfa9879.txt
 +F:    Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml
  F:    sound/soc/codecs/tfa9879*
  
  NXP-NCI NFC DRIVER
@@@ -15573,13 -15460,6 +15573,13 @@@ F: include/linux/objagg.
  F:    lib/objagg.c
  F:    lib/test_objagg.c
  
 +OBJPOOL
 +M:    Matt Wu <[email protected]>
 +S:    Supported
 +F:    include/linux/objpool.h
 +F:    lib/objpool.c
 +F:    lib/test_objpool.c
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -16091,7 -15971,6 +16091,7 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    tools/testing/selftests/dt/
  K:    of_overlay_notifier_
  K:    of_overlay_fdt_apply
  K:    of_overlay_remove
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <[email protected]>
 -S:    Maintained
 -F:    drivers/firmware/pcdp.*
 -
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <[email protected]>
  M:    Pali Rohár <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/*rcar*
  F:    drivers/pci/controller/*rcar*
 +F:    drivers/pci/controller/dwc/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <[email protected]>
@@@ -16608,7 -16491,7 +16608,7 @@@ R:   Oliver O'Halloran <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.rst
 -F:    Documentation/powerpc/eeh-pci-error-recovery.rst
 +F:    Documentation/arch/powerpc/eeh-pci-error-recovery.rst
  F:    arch/powerpc/include/*/eeh*.h
  F:    arch/powerpc/kernel/eeh*.c
  F:    arch/powerpc/platforms/*/eeh*.c
@@@ -17718,7 -17601,6 +17718,7 @@@ M:   Kalle Valo <[email protected]
  M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
 +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 -F:    drivers/genpd/qcom/cpr.c
 +F:    drivers/pmdomain/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <[email protected]>
@@@ -17918,18 -17800,6 +17918,18 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
 +QUALCOMM QSEECOM DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom.c
 +
 +QUALCOMM QSEECOM UEFISECAPP DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom_uefisecapp.c
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <[email protected]>
  M:    Sean Tranchetti <[email protected]>
@@@ -17992,7 -17862,6 +17992,7 @@@ C:   irc://irc.oftc.net/radeo
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/ci/xfails/amd*
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
  F:    include/uapi/drm/radeon_drm.h
@@@ -18057,6 -17926,7 +18057,6 @@@ F:   arch/mips/boot/dts/ralink/mt7621
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
 -M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/ralink/rt2x00/
@@@ -18261,6 -18131,8 +18261,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
  C:    irc://irc.libera.chat/riscv
 -P:    Documentation/riscv/patch-acceptance.rst
 +P:    Documentation/arch/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
  N:    riscv
@@@ -18736,7 -18608,7 +18736,7 @@@ ROSE NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/rose.h
  F:    include/uapi/linux/rose.h
  F:    net/rose/
@@@ -18788,6 -18660,7 +18788,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18795,12 -18668,14 +18795,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -18833,10 -18708,9 +18833,10 @@@ R: Andreas Hindborg <a.hindborg@samsung
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://github.com/Rust-for-Linux/linux
 +W:    https://rust-for-linux.com
  B:    https://github.com/Rust-for-Linux/linux/issues
  C:    zulip://rust-for-linux.zulipchat.com
 +P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -19288,6 -19162,7 +19288,6 @@@ M:   "Martin K. Petersen" <martin.peterse
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -W:    http://www.linux-iscsi.org
  Q:    https://patchwork.kernel.org/project/target-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
  F:    Documentation/target/
@@@ -19370,8 -19245,7 +19370,8 @@@ F:   Documentation/devicetree/bindings/mm
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 -M:    Eugen Hristev <[email protected]>
 +M:    Aubin Constans <[email protected]>
 +R:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -19528,7 -19402,6 +19528,7 @@@ F:   drivers/net/ethernet/sfc
  
  SFCTEMP HWMON DRIVER
  M:    Emil Renner Berthing <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
@@@ -20190,17 -20063,10 +20190,17 @@@ F:        drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
 +SOPHGO DEVICETREES
 +M:    Chao Wei <[email protected]>
 +M:    Chen Wang <[email protected]>
 +S:    Maintained
 +F:    arch/riscv/boot/dts/sophgo/
 +F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
 +
  SOUND
  M:    Jaroslav Kysela <[email protected]>
  M:    Takashi Iwai <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
  W:    http://www.alsa-project.org/
  Q:    http://patchwork.kernel.org/project/alsa-devel/list/
@@@ -20213,7 -20079,7 +20213,7 @@@ F:   tools/testing/selftests/als
  
  SOUND - ALSA SELFTESTS
  M:    Mark Brown <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    tools/testing/selftests/alsa
@@@ -20239,7 -20105,7 +20239,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Supported
  W:    http://alsa-project.org/main/index.php/ASoC
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
@@@ -20247,10 -20113,6 +20247,10 @@@ F: Documentation/devicetree/bindings/so
  F:    Documentation/sound/soc/
  F:    include/dt-bindings/sound/
  F:    include/sound/soc*
 +F:    include/sound/sof.h
 +F:    include/sound/sof/
 +F:    include/trace/events/sof*.h
 +F:    include/uapi/sound/asoc.h
  F:    sound/soc/
  
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
@@@ -20604,13 -20466,6 +20604,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
  F:    drivers/clk/starfive/clk-starfive-jh7110-pll.c
  
 +STARFIVE JH7110 PWMDAC DRIVER
 +M:    Hal Feng <[email protected]>
 +M:    Xingyu Wu <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml
 +F:    sound/soc/starfive/jh7110_pwmdac.c
 +
  STARFIVE JH7110 SYSCON
  M:    William Qiu <[email protected]>
  M:    Xingyu Wu <[email protected]>
@@@ -20634,7 -20489,6 +20634,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -20658,10 -20512,9 +20658,10 @@@ F: drivers/usb/cdns3/cdns3-starfive.
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <[email protected]>
 +M:    Changhuang Liang <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/genpd/starfive/jh71xx-pmu.c
 +F:    drivers/pmdomain/starfive/
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
@@@ -20669,6 -20522,7 +20669,6 @@@ M:   Conor Dooley <[email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
  F:    Documentation/devicetree/bindings/soc/starfive/
 -F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
  M:    Jia Jie Ho <[email protected]>
@@@ -21049,7 -20903,6 +21049,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/pmdomain/arm/
  F:    drivers/powercap/arm_scmi_powercap.c
  F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
@@@ -21486,7 -21339,7 +21486,7 @@@ F:   drivers/irqchip/irq-ti-sci-inta.
  F:    drivers/irqchip/irq-ti-sci-intr.c
  F:    drivers/reset/reset-ti-sci.c
  F:    drivers/soc/ti/ti_sci_inta_msi.c
 -F:    drivers/genpd/ti/ti_sci_pm_domains.c
 +F:    drivers/pmdomain/ti/ti_sci_pm_domains.c
  F:    include/dt-bindings/soc/ti,sci_pm_domain.h
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
@@@ -21509,8 -21362,8 +21509,8 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 -R:    Amit Kucheria <[email protected]>
  R:    Zhang Rui <[email protected]>
 +R:    Lukasz Luba <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
 -F:    drivers/genpd/ti/omap_prm.c
 +F:    drivers/pmdomain/ti/omap_prm.c
  F:    drivers/soc/ti/*
  
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -21977,11 -21831,9 +21977,11 @@@ W: https://www.tq-group.com/en/products
  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/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*
  F:    arch/arm64/boot/dts/freescale/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/tqml*.dts*
  F:    drivers/gpio/gpio-tqmx86.c
  F:    drivers/mfd/tqmx86.c
  F:    drivers/watchdog/tqmx86_wdt.c
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/ci/xfails/virtio*
  F:    drivers/gpu/drm/virtio/
  F:    include/uapi/linux/virtio_gpu.h
  
@@@ -23085,7 -22936,7 +23085,7 @@@ F:   fs/vboxsf/
  
  VIRTUAL PCM TEST DRIVER
  M:    Ivan Orlov <[email protected]>
 -L:    alsa-devel@alsa-project.org
 +L:    [email protected].org
  S:    Maintained
  F:    Documentation/sound/cards/pcmtest.rst
  F:    sound/drivers/pcmtest.c
@@@ -23188,7 -23039,7 +23188,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Deep Shah <sdeep@vmware.com>
 +M:    Jeff Sipek <jsipek@vmware.com>
  R:    Ajay Kaher <[email protected]>
  R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
@@@ -23573,11 -23424,9 +23573,11 @@@ F: drivers/platform/x86/x86-android-tab
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  L:    [email protected]
  S:    Maintained
 +Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
@@@ -23835,11 -23684,6 +23835,11 @@@ F: Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
 +XILINX LL TEMAC ETHERNET DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/net/ethernet/xilinx/ll_temac*
 +
  XILINX PWM DRIVER
  M:    Sean Anderson <[email protected]>
  S:    Maintained
@@@ -23872,13 -23716,6 +23872,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <[email protected]>
  R:    Shubhrajyoti Datta <[email protected]>
diff --combined certs/Kconfig
index 62036974367c49b5f2da9967e39b1b13841ac22d,69d192a32ddaeae726382f9f2960f804657bb342..78307dc25559148a08985a868f296621b3922768
@@@ -30,9 -30,11 +30,11 @@@ config MODULE_SIG_KEY_TYPE_RS
  config MODULE_SIG_KEY_TYPE_ECDSA
        bool "ECDSA"
        select CRYPTO_ECDSA
+       depends on !(MODULE_SIG_SHA256 || MODULE_SIG_SHA3_256)
        help
-        Use an elliptic curve key (NIST P384) for module signing. Consider
-        using a strong hash like sha256 or sha384 for hashing modules.
+        Use an elliptic curve key (NIST P384) for module signing. Use
+        a strong hash of same or higher bit length, i.e. sha384 or
+        sha512 for hashing modules.
  
         Note: Remove all ECDSA signing keys, e.g. certs/signing_key.pem,
         when falling back to building Linux 5.14 and older kernels.
@@@ -88,21 -90,7 +90,21 @@@ config SECONDARY_TRUSTED_KEYRIN
        help
          If set, provide a keyring to which extra keys may be added, provided
          those keys are not blacklisted and are vouched for by a key built
 -        into the kernel or already in the secondary trusted keyring.
 +        into the kernel, machine keyring (if configured), or already in the
 +        secondary trusted keyring.
 +
 +config SECONDARY_TRUSTED_KEYRING_SIGNED_BY_BUILTIN
 +      bool "Only allow additional certs signed by keys on the builtin trusted keyring"
 +      depends on SECONDARY_TRUSTED_KEYRING
 +      help
 +        If set, only certificates signed by keys on the builtin trusted
 +        keyring may be loaded onto the secondary trusted keyring.
 +
 +        Note: The machine keyring, if configured, will be linked to the
 +        secondary keyring.  When enabling this option, it is recommended
 +        to also configure INTEGRITY_CA_MACHINE_KEYRING_MAX to prevent
 +        linking code signing keys with imputed trust to the secondary
 +        trusted keyring.
  
  config SYSTEM_BLACKLIST_KEYRING
        bool "Provide system-wide ring of blacklisted keys"
index 1dcab27986a6a1b54b3957e08047f5c0ba05dfa6,8eeab38a3d8ae2d76cd2c7077a743ed5beaaec2f..e5f22691febd599d9a1eeb3310c19c762e715cd8
@@@ -81,13 -81,14 +81,13 @@@ software_key_determine_akcipher(const s
                 * RSA signatures usually use EMSA-PKCS1-1_5 [RFC3447 sec 8.2].
                 */
                if (strcmp(encoding, "pkcs1") == 0) {
 +                      *sig = op == kernel_pkey_sign ||
 +                             op == kernel_pkey_verify;
                        if (!hash_algo) {
 -                              *sig = false;
                                n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
                                             "pkcs1pad(%s)",
                                             pkey->pkey_algo);
                        } else {
 -                              *sig = op == kernel_pkey_sign ||
 -                                     op == kernel_pkey_verify;
                                n = snprintf(alg_name, CRYPTO_MAX_ALG_NAME,
                                             "pkcs1pad(%s,%s)",
                                             pkey->pkey_algo, hash_algo);
                 */
                if (!hash_algo)
                        return -EINVAL;
-               if (strcmp(hash_algo, "sha1") != 0 &&
-                   strcmp(hash_algo, "sha224") != 0 &&
+               if (strcmp(hash_algo, "sha224") != 0 &&
                    strcmp(hash_algo, "sha256") != 0 &&
                    strcmp(hash_algo, "sha384") != 0 &&
-                   strcmp(hash_algo, "sha512") != 0)
+                   strcmp(hash_algo, "sha512") != 0 &&
+                   strcmp(hash_algo, "sha3-256") != 0 &&
+                   strcmp(hash_algo, "sha3-384") != 0 &&
+                   strcmp(hash_algo, "sha3-512") != 0)
                        return -EINVAL;
        } else if (strcmp(pkey->pkey_algo, "sm2") == 0) {
                if (strcmp(encoding, "raw") != 0)
diff --combined fs/crypto/keysetup_v1.c
index a10710bc81230f47ef745c228ec5bcfdf3023381,d698ecb9ad44cacc5fb99787ad47b1d2a9ca8589..cf3b58ec32ccec393b1c2096bb5d4c2399502107
@@@ -20,8 -20,8 +20,8 @@@
   *    managed alongside the master keys in the filesystem-level keyring)
   */
  
- #include <crypto/algapi.h>
  #include <crypto/skcipher.h>
+ #include <crypto/utils.h>
  #include <keys/user-type.h>
  #include <linux/hashtable.h>
  #include <linux/scatterlist.h>
@@@ -178,8 -178,7 +178,8 @@@ void fscrypt_put_direct_key(struct fscr
   */
  static struct fscrypt_direct_key *
  find_or_insert_direct_key(struct fscrypt_direct_key *to_insert,
 -                        const u8 *raw_key, const struct fscrypt_info *ci)
 +                        const u8 *raw_key,
 +                        const struct fscrypt_inode_info *ci)
  {
        unsigned long hash_key;
        struct fscrypt_direct_key *dk;
  
  /* Prepare to encrypt directly using the master key in the given mode */
  static struct fscrypt_direct_key *
 -fscrypt_get_direct_key(const struct fscrypt_info *ci, const u8 *raw_key)
 +fscrypt_get_direct_key(const struct fscrypt_inode_info *ci, const u8 *raw_key)
  {
        struct fscrypt_direct_key *dk;
        int err;
@@@ -251,7 -250,7 +251,7 @@@ err_free_dk
  }
  
  /* v1 policy, DIRECT_KEY: use the master key directly */
 -static int setup_v1_file_key_direct(struct fscrypt_info *ci,
 +static int setup_v1_file_key_direct(struct fscrypt_inode_info *ci,
                                    const u8 *raw_master_key)
  {
        struct fscrypt_direct_key *dk;
  }
  
  /* v1 policy, !DIRECT_KEY: derive the file's encryption key */
 -static int setup_v1_file_key_derived(struct fscrypt_info *ci,
 +static int setup_v1_file_key_derived(struct fscrypt_inode_info *ci,
                                     const u8 *raw_master_key)
  {
        u8 *derived_key;
@@@ -290,8 -289,7 +290,8 @@@ out
        return err;
  }
  
 -int fscrypt_setup_v1_file_key(struct fscrypt_info *ci, const u8 *raw_master_key)
 +int fscrypt_setup_v1_file_key(struct fscrypt_inode_info *ci,
 +                            const u8 *raw_master_key)
  {
        if (ci->ci_policy.v1.flags & FSCRYPT_POLICY_FLAG_DIRECT_KEY)
                return setup_v1_file_key_direct(ci, raw_master_key);
                return setup_v1_file_key_derived(ci, raw_master_key);
  }
  
 -int fscrypt_setup_v1_file_key_via_subscribed_keyrings(struct fscrypt_info *ci)
 +int
 +fscrypt_setup_v1_file_key_via_subscribed_keyrings(struct fscrypt_inode_info *ci)
  {
 +      const struct super_block *sb = ci->ci_inode->i_sb;
        struct key *key;
        const struct fscrypt_key *payload;
        int err;
        key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,
                                        ci->ci_policy.v1.master_key_descriptor,
                                        ci->ci_mode->keysize, &payload);
 -      if (key == ERR_PTR(-ENOKEY) && ci->ci_inode->i_sb->s_cop->key_prefix) {
 -              key = find_and_lock_process_key(ci->ci_inode->i_sb->s_cop->key_prefix,
 +      if (key == ERR_PTR(-ENOKEY) && sb->s_cop->legacy_key_prefix) {
 +              key = find_and_lock_process_key(sb->s_cop->legacy_key_prefix,
                                                ci->ci_policy.v1.master_key_descriptor,
                                                ci->ci_mode->keysize, &payload);
        }
diff --combined fs/ubifs/ubifs.h
index 62633816d7d045d0f3feb09d0a1db7e924c99f65,4696f8364b35a5b68a7dfbb2a35e57ee75645bc4..3916dc4f30caa65072eb90b3d78762f41d56c82a
@@@ -31,7 -31,7 +31,7 @@@
  #include <linux/completion.h>
  #include <crypto/hash_info.h>
  #include <crypto/hash.h>
- #include <crypto/algapi.h>
+ #include <crypto/utils.h>
  
  #include <linux/fscrypt.h>
  
@@@ -2043,7 -2043,7 +2043,7 @@@ ssize_t ubifs_xattr_get(struct inode *h
                        size_t size);
  
  #ifdef CONFIG_UBIFS_FS_XATTR
 -extern const struct xattr_handler *ubifs_xattr_handlers[];
 +extern const struct xattr_handler * const ubifs_xattr_handlers[];
  ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size);
  void ubifs_evict_xattr_inode(struct ubifs_info *c, ino_t xattr_inum);
  int ubifs_purge_xattrs(struct inode *host);
diff --combined net/mptcp/subflow.c
index e120e961645406551be353fd661cdb58dee299b3,d1e03c0bc1188905476734474569af55a5ea0b98..a4f3c27f0309f9000435d83b41b199067b31f341
@@@ -9,8 -9,8 +9,8 @@@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/netdevice.h>
- #include <crypto/algapi.h>
  #include <crypto/sha2.h>
+ #include <crypto/utils.h>
  #include <net/sock.h>
  #include <net/inet_common.h>
  #include <net/inet_hashtables.h>
@@@ -421,7 -421,6 +421,7 @@@ static bool subflow_use_different_dport
  
  void __mptcp_set_connected(struct sock *sk)
  {
 +      __mptcp_propagate_sndbuf(sk, mptcp_sk(sk)->first);
        if (sk->sk_state == TCP_SYN_SENT) {
                inet_sk_state_store(sk, TCP_ESTABLISHED);
                sk->sk_state_change(sk);
@@@ -473,6 -472,7 +473,6 @@@ static void subflow_finish_connect(stru
                return;
  
        msk = mptcp_sk(parent);
 -      mptcp_propagate_sndbuf(parent, sk);
        subflow->rel_write_seq = 1;
        subflow->conn_finished = 1;
        subflow->ssn_offset = TCP_SKB_CB(skb)->seq;
@@@ -1226,7 -1226,7 +1226,7 @@@ static void mptcp_subflow_fail(struct m
        WRITE_ONCE(subflow->fail_tout, fail_tout);
        tcp_send_ack(ssk);
  
 -      mptcp_reset_timeout(msk, subflow->fail_tout);
 +      mptcp_reset_tout_timer(msk, subflow->fail_tout);
  }
  
  static bool subflow_check_data_avail(struct sock *ssk)
        struct sk_buff *skb;
  
        if (!skb_peek(&ssk->sk_receive_queue))
 -              WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
 +              WRITE_ONCE(subflow->data_avail, false);
        if (subflow->data_avail)
                return true;
  
                        continue;
                }
  
 -              WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);
 +              WRITE_ONCE(subflow->data_avail, true);
                break;
        }
        return true;
@@@ -1293,7 -1293,7 +1293,7 @@@ fallback
                                goto reset;
                        }
                        mptcp_subflow_fail(msk, ssk);
 -                      WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);
 +                      WRITE_ONCE(subflow->data_avail, true);
                        return true;
                }
  
@@@ -1310,7 -1310,7 +1310,7 @@@ reset
                        while ((skb = skb_peek(&ssk->sk_receive_queue)))
                                sk_eat_skb(ssk, skb);
                        tcp_send_active_reset(ssk, GFP_ATOMIC);
 -                      WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
 +                      WRITE_ONCE(subflow->data_avail, false);
                        return false;
                }
  
        subflow->map_seq = READ_ONCE(msk->ack_seq);
        subflow->map_data_len = skb->len;
        subflow->map_subflow_seq = tcp_sk(ssk)->copied_seq - subflow->ssn_offset;
 -      WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);
 +      WRITE_ONCE(subflow->data_avail, true);
        return true;
  }
  
@@@ -1334,7 -1334,7 +1334,7 @@@ bool mptcp_subflow_data_available(struc
        if (subflow->map_valid &&
            mptcp_subflow_get_map_offset(subflow) >= subflow->map_data_len) {
                subflow->map_valid = 0;
 -              WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
 +              WRITE_ONCE(subflow->data_avail, false);
  
                pr_debug("Done with mapping: seq=%u data_len=%u",
                         subflow->map_subflow_seq,
@@@ -1362,6 -1362,42 +1362,6 @@@ void mptcp_space(const struct sock *ssk
        *full_space = mptcp_win_from_space(sk, READ_ONCE(sk->sk_rcvbuf));
  }
  
 -void __mptcp_error_report(struct sock *sk)
 -{
 -      struct mptcp_subflow_context *subflow;
 -      struct mptcp_sock *msk = mptcp_sk(sk);
 -
 -      mptcp_for_each_subflow(msk, subflow) {
 -              struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
 -              int err = sock_error(ssk);
 -              int ssk_state;
 -
 -              if (!err)
 -                      continue;
 -
 -              /* only propagate errors on fallen-back sockets or
 -               * on MPC connect
 -               */
 -              if (sk->sk_state != TCP_SYN_SENT && !__mptcp_check_fallback(msk))
 -                      continue;
 -
 -              /* We need to propagate only transition to CLOSE state.
 -               * Orphaned socket will see such state change via
 -               * subflow_sched_work_if_closed() and that path will properly
 -               * destroy the msk as needed.
 -               */
 -              ssk_state = inet_sk_state_load(ssk);
 -              if (ssk_state == TCP_CLOSE && !sock_flag(sk, SOCK_DEAD))
 -                      inet_sk_state_store(sk, ssk_state);
 -              WRITE_ONCE(sk->sk_err, -err);
 -
 -              /* This barrier is coupled with smp_rmb() in mptcp_poll() */
 -              smp_wmb();
 -              sk_error_report(sk);
 -              break;
 -      }
 -}
 -
  static void subflow_error_report(struct sock *ssk)
  {
        struct sock *sk = mptcp_subflow_ctx(ssk)->conn;
@@@ -1405,18 -1441,10 +1405,18 @@@ static void subflow_data_ready(struct s
        WARN_ON_ONCE(!__mptcp_check_fallback(msk) && !subflow->mp_capable &&
                     !subflow->mp_join && !(state & TCPF_CLOSE));
  
 -      if (mptcp_subflow_data_available(sk))
 +      if (mptcp_subflow_data_available(sk)) {
                mptcp_data_ready(parent, sk);
 -      else if (unlikely(sk->sk_err))
 +
 +              /* subflow-level lowat test are not relevant.
 +               * respect the msk-level threshold eventually mandating an immediate ack
 +               */
 +              if (mptcp_data_avail(msk) < parent->sk_rcvlowat &&
 +                  (tcp_sk(sk)->rcv_nxt - tcp_sk(sk)->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss)
 +                      inet_csk(sk)->icsk_ack.pending |= ICSK_ACK_NOW;
 +      } else if (unlikely(sk->sk_err)) {
                subflow_error_report(sk);
 +      }
  }
  
  static void subflow_write_space(struct sock *ssk)
@@@ -1533,6 -1561,8 +1533,6 @@@ int __mptcp_subflow_connect(struct soc
        if (addr.ss_family == AF_INET6)
                addrlen = sizeof(struct sockaddr_in6);
  #endif
 -      mptcp_sockopt_sync(msk, ssk);
 -
        ssk->sk_bound_dev_if = ifindex;
        err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen);
        if (err)
        mptcp_sock_graft(ssk, sk->sk_socket);
        iput(SOCK_INODE(sf));
        WRITE_ONCE(msk->allow_infinite_fallback, false);
 +      mptcp_stop_tout_timer(sk);
        return 0;
  
  failed_unlink:
@@@ -1643,7 -1672,7 +1643,7 @@@ int mptcp_subflow_create_socket(struct 
  
        err = security_mptcp_add_subflow(sk, sf->sk);
        if (err)
 -              goto release_ssk;
 +              goto err_free;
  
        /* the newly created socket has to be in the same cgroup as its parent */
        mptcp_attach_cgroup(sk, sf->sk);
        get_net_track(net, &sf->sk->ns_tracker, GFP_KERNEL);
        sock_inuse_add(net, 1);
        err = tcp_set_ulp(sf->sk, "mptcp");
 +      if (err)
 +              goto err_free;
  
 -release_ssk:
 +      mptcp_sockopt_sync_locked(mptcp_sk(sk), sf->sk);
        release_sock(sf->sk);
  
 -      if (err) {
 -              sock_release(sf);
 -              return err;
 -      }
 -
        /* the newly created socket really belongs to the owning MPTCP master
         * socket, even if for additional subflows the allocation is performed
         * by a kernel workqueue. Adjust inode references, so that the
        mptcp_subflow_ops_override(sf->sk);
  
        return 0;
 +
 +err_free:
 +      release_sock(sf->sk);
 +      sock_release(sf);
 +      return err;
  }
  
  static struct mptcp_subflow_context *subflow_create_ctx(struct sock *sk,
@@@ -1736,6 -1763,7 +1736,6 @@@ static void subflow_state_change(struc
  
        msk = mptcp_sk(parent);
        if (subflow_simultaneous_connect(sk)) {
 -              mptcp_propagate_sndbuf(parent, sk);
                mptcp_do_fallback(sk);
                mptcp_rcv_space_init(msk, sk);
                pr_fallback(msk);
@@@ -1963,15 -1991,9 +1963,15 @@@ static void subflow_ulp_clone(const str
  static void tcp_release_cb_override(struct sock *ssk)
  {
        struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
 +      long status;
  
 -      if (mptcp_subflow_has_delegated_action(subflow))
 -              mptcp_subflow_process_delegated(ssk);
 +      /* process and clear all the pending actions, but leave the subflow into
 +       * the napi queue. To respect locking, only the same CPU that originated
 +       * the action can touch the list. mptcp_napi_poll will take care of it.
 +       */
 +      status = set_mask_bits(&subflow->delegated_status, MPTCP_DELEGATE_ACTIONS_MASK, 0);
 +      if (status)
 +              mptcp_subflow_process_delegated(ssk, status);
  
        tcp_release_cb(ssk);
  }
@@@ -2051,6 -2073,7 +2051,6 @@@ void __init mptcp_subflow_init(void
        subflow_v6m_specific.send_check = ipv4_specific.send_check;
        subflow_v6m_specific.net_header_len = ipv4_specific.net_header_len;
        subflow_v6m_specific.mtu_reduced = ipv4_specific.mtu_reduced;
 -      subflow_v6m_specific.net_frag_header_len = 0;
        subflow_v6m_specific.rebuild_header = subflow_rebuild_header;
  
        tcpv6_prot_override = tcpv6_prot;
This page took 0.26448 seconds and 4 git commands to generate.