diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 1286c561c..281b5324a 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3393,7 +3393,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 05db05353..88627016f 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3372,7 +3372,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6b7bd1391..6b45d0644 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3390,7 +3390,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d23cce76d..02fefd389 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3369,7 +3369,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 398071e4c..f12697aff 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3430,7 +3430,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c1f56de62..7fdad6e76 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3409,7 +3409,6 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_MLXREG is not set # CONFIG_LEDS_NIC78BX is not set -CONFIG_LEDS_PCA9532_GPIO=y # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a3cefe6db..c806000cb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2226,7 +2226,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3322,7 +3322,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3350,7 +3350,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index cd9ab776f..cdaa48911 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2208,7 +2208,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3297,7 +3297,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3325,7 +3325,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 993a98446..a310181b6 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -2255,7 +2255,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3325,7 +3325,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3353,7 +3353,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 34b0fc20f..a9a5b0266 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -2237,7 +2237,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3300,7 +3300,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3328,7 +3328,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 477e5930b..a333a5e1a 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2218,7 +2218,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3287,6 +3287,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3314,6 +3315,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m @@ -3328,6 +3331,7 @@ CONFIG_LEDS_SY7802=m # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 59f00837f..d54fa2294 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3057,6 +3057,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_TRIGGER_ACTIVITY is not set CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 949dea9c5..7317358b3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2200,7 +2200,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3262,6 +3262,7 @@ CONFIG_LEDS_CR0014114=m CONFIG_LEDS_CROS_EC=m # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_EL15203000 is not set +CONFIG_LEDS_GPIO=m CONFIG_LEDS_GROUP_MULTICOLOR=m # CONFIG_LEDS_IS31FL319X is not set CONFIG_LEDS_IS31FL32XX=m @@ -3289,6 +3290,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m @@ -3303,6 +3306,7 @@ CONFIG_LEDS_SY7802=m # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 0f33fdf6a..b7a479be2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3037,6 +3037,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_TRIGGER_ACTIVITY is not set CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 920a6ca54..fa1ee66ad 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3045,6 +3045,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_TRIGGER_ACTIVITY is not set CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5d94252e3..9cd9448bd 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2440,7 +2440,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3685,7 +3685,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 02391d72b..5715e8ddd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2422,7 +2422,7 @@ CONFIG_GPIO_MLXBF2=m CONFIG_GPIO_MXC=m # CONFIG_GPIO_PCA953X_IRQ is not set CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA9570 is not set +CONFIG_GPIO_PCA9570=m # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_PCH is not set # CONFIG_GPIO_PCIE_IDIO_24 is not set @@ -3660,7 +3660,8 @@ CONFIG_LEDS_MLXREG=m CONFIG_LEDS_NCP5623=m CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_OT200 is not set -# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set CONFIG_LEDS_PCA995X=m diff --git a/kernel.changelog b/kernel.changelog index 0ce97ec57..31c7b8215 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* Tue Oct 22 2024 Augusto Caringi [6.11.5-0] +- Revert "fedora/configs: enable GPIO expander drivers" (Justin M. Forbes) +- Add bluetooth bzs to BugsFixed (Justin M. Forbes) +- Bluetooth: btusb: Fix not being able to reconnect after suspend (Luiz Augusto von Dentz) +- Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001 (Luiz Augusto von Dentz) +- Linux v6.11.5 +Resolves: + * Thu Oct 17 2024 Augusto Caringi [6.11.4-0] - Add F39 and F40 to release_targets (Justin M. Forbes) - Linux v6.11.4 diff --git a/kernel.spec b/kernel.spec index 99aaad17f..868eebc4f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.11.4 -%define specversion 6.11.4 +%define specrpmversion 6.11.5 +%define specversion 6.11.5 %define patchversion 6.11 -%define pkgrelease 301 +%define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.11.4 +%define tarfile_release 6.11.5 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 301%{?buildid}%{?dist} +%define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.11.4 +%define kabiversion 6.11.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4128,10 +4128,12 @@ fi\ # # %changelog -* Sun Oct 20 2024 Justin M. Forbes [6.11.4-301] +* Tue Oct 22 2024 Augusto Caringi [6.11.5-0] +- Revert "fedora/configs: enable GPIO expander drivers" (Justin M. Forbes) - Add bluetooth bzs to BugsFixed (Justin M. Forbes) - Bluetooth: btusb: Fix not being able to reconnect after suspend (Luiz Augusto von Dentz) - Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001 (Luiz Augusto von Dentz) +- Linux v6.11.5 * Thu Oct 17 2024 Augusto Caringi [6.11.4-0] - Add F39 and F40 to release_targets (Justin M. Forbes) diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 8d2bce100..0d108e27b 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -19,7 +19,6 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + drivers/ata/libahci.c | 18 ++ - drivers/bluetooth/btusb.c | 27 +- drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + @@ -46,10 +45,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 48 files changed, 1029 insertions(+), 258 deletions(-) + 47 files changed, 1020 insertions(+), 240 deletions(-) diff --git a/Makefile b/Makefile -index 50c615983e44..d058453e3dfd 100644 +index 687ce7aee67a7..47e5d15bc9d22 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -114,7 +113,7 @@ index 50c615983e44..d058453e3dfd 100644 @: diff --git a/arch/arm/boot/dts/broadcom/bcm2837.dtsi b/arch/arm/boot/dts/broadcom/bcm2837.dtsi -index 84c08b46519d..c281697142b1 100644 +index 84c08b46519da..c281697142b1a 100644 --- a/arch/arm/boot/dts/broadcom/bcm2837.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2837.dtsi @@ -9,7 +9,7 @@ soc { @@ -127,7 +126,7 @@ index 84c08b46519d..c281697142b1 100644 reg = <0x40000000 0x100>; interrupt-controller; diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 89b331575ed4..1934eeb89804 100644 +index 89b331575ed49..1934eeb898044 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1366,7 +1366,7 @@ endchoice @@ -140,7 +139,7 @@ index 89b331575ed4..1934eeb89804 100644 For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index e868ca5ae753..a5c3920e0f04 100644 +index e868ca5ae753a..a5c3920e0f048 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -263,6 +263,14 @@ gpu0_thermal: gpu0-thermal { @@ -174,7 +173,7 @@ index e868ca5ae753..a5c3920e0f04 100644 }; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index 8b4591ddd27c..92565e9781ad 100644 +index 8b4591ddd27cc..92565e9781ad3 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -6,6 +6,7 @@ DTC_FLAGS := -@ @@ -187,7 +186,7 @@ index 8b4591ddd27c..92565e9781ad 100644 bcm2837-rpi-3-b-plus.dtb \ diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts new file mode 100644 -index 000000000000..2bdbb6780242 +index 0000000000000..2bdbb6780242a --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts @@ -0,0 +1,64 @@ @@ -257,7 +256,7 @@ index 000000000000..2bdbb6780242 +}; diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi new file mode 100644 -index 000000000000..6e5a984c1d4e +index 0000000000000..6e5a984c1d4ea --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi @@ -0,0 +1,283 @@ @@ -545,7 +544,7 @@ index 000000000000..6e5a984c1d4e + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts -index b27143f81867..320706c88cdd 100644 +index b27143f81867a..320706c88cdd6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -592,6 +592,57 @@ vreg_l10d: ldo10 { @@ -630,7 +629,7 @@ index b27143f81867..320706c88cdd 100644 pins = "gpio25"; function = "gpio"; diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d..afb9544fb007 100644 +index b0d00032479d6..afb9544fb0074 100644 --- a/arch/s390/include/asm/ipl.h +++ b/arch/s390/include/asm/ipl.h @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, @@ -642,7 +641,7 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index f17bb7bf9392..66e530380ee3 100644 +index f17bb7bf93924..66e530380ee30 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report) @@ -655,7 +654,7 @@ index f17bb7bf9392..66e530380ee3 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index a3fea683b227..a3162d93f437 100644 +index a3fea683b2270..a3162d93f437d 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -677,7 +676,7 @@ index a3fea683b227..a3162d93f437 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 6129dc2ba784..feaf5fd3f37d 100644 +index 6129dc2ba784c..feaf5fd3f37d5 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -724,7 +723,7 @@ index 6129dc2ba784..feaf5fd3f37d 100644 reserve_initrd(); diff --git a/certs/extract-cert.c b/certs/extract-cert.c -index 70e9ec89d87d..f5fb74916cee 100644 +index 70e9ec89d87d3..f5fb74916cee4 100644 --- a/certs/extract-cert.c +++ b/certs/extract-cert.c @@ -21,7 +21,6 @@ @@ -767,7 +766,7 @@ index 70e9ec89d87d..f5fb74916cee 100644 BIO *b; X509 *x509; diff --git a/crypto/akcipher.c b/crypto/akcipher.c -index e0ff5f4dda6d..098a52ded759 100644 +index e0ff5f4dda6d6..098a52ded759c 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -126,14 +126,12 @@ int crypto_register_akcipher(struct akcipher_alg *alg) @@ -788,7 +787,7 @@ index e0ff5f4dda6d..098a52ded759 100644 alg->set_priv_key = akcipher_default_set_key; diff --git a/crypto/dh.c b/crypto/dh.c -index 68d11d66c0b5..6e3e515b2452 100644 +index 68d11d66c0b54..6e3e515b24526 100644 --- a/crypto/dh.c +++ b/crypto/dh.c @@ -227,10 +227,35 @@ static int dh_compute_value(struct kpp_request *req) @@ -828,7 +827,7 @@ index 68d11d66c0b5..6e3e515b2452 100644 } diff --git a/crypto/seqiv.c b/crypto/seqiv.c -index 17e11d51ddc3..9c136a3b6267 100644 +index 17e11d51ddc36..9c136a3b62679 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c @@ -132,6 +132,19 @@ static int seqiv_aead_decrypt(struct aead_request *req) @@ -861,7 +860,7 @@ index 17e11d51ddc3..9c136a3b6267 100644 inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index f02cb075bd68..669e306f1cb2 100644 +index f02cb075bd681..669e306f1cb22 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4216,7 +4216,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -889,7 +888,7 @@ index f02cb075bd68..669e306f1cb2 100644 .kpp = __VECS(ecdh_p384_tv_template) } diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d..90a13f20f052 100644 +index 20d757687e3d9..90a13f20f052b 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data) @@ -908,7 +907,7 @@ index 20d757687e3d..90a13f20f052 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index 1687483ff319..390b67f19181 100644 +index 1687483ff319e..390b67f19181a 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -951,7 +950,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 22ae7829a915..1329032ed09b 100644 +index 22ae7829a9155..1329032ed09b6 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -971,7 +970,7 @@ index 22ae7829a915..1329032ed09b 100644 acpi_dev_get_resources(device, &resource_list, acpi_check_serial_bus_slave, diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index fdfa7b266218..f5f8ba457c93 100644 +index fdfa7b2662180..f5f8ba457c93f 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -999,74 +998,8 @@ index fdfa7b266218..f5f8ba457c93 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index a1e9b052bc84..2408e50743ca 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1399,10 +1399,15 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) - if (!urb) - return -ENOMEM; - -- /* Use maximum HCI Event size so the USB stack handles -- * ZPL/short-transfer automatically. -- */ -- size = HCI_MAX_EVENT_SIZE; -+ if (le16_to_cpu(data->udev->descriptor.idVendor) == 0x0a12 && -+ le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001) -+ /* Fake CSR devices don't seem to support sort-transter */ -+ size = le16_to_cpu(data->intr_ep->wMaxPacketSize); -+ else -+ /* Use maximum HCI Event size so the USB stack handles -+ * ZPL/short-transfer automatically. -+ */ -+ size = HCI_MAX_EVENT_SIZE; - - buf = kmalloc(size, mem_flags); - if (!buf) { -@@ -4092,7 +4097,6 @@ static void btusb_disconnect(struct usb_interface *intf) - static int btusb_suspend(struct usb_interface *intf, pm_message_t message) - { - struct btusb_data *data = usb_get_intfdata(intf); -- int err; - - BT_DBG("intf %p", intf); - -@@ -4105,16 +4109,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) - if (data->suspend_count++) - return 0; - -- /* Notify Host stack to suspend; this has to be done before stopping -- * the traffic since the hci_suspend_dev itself may generate some -- * traffic. -- */ -- err = hci_suspend_dev(data->hdev); -- if (err) { -- data->suspend_count--; -- return err; -- } -- - spin_lock_irq(&data->txlock); - if (!(PMSG_IS_AUTO(message) && data->tx_in_flight)) { - set_bit(BTUSB_SUSPENDING, &data->flags); -@@ -4122,7 +4116,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) - } else { - spin_unlock_irq(&data->txlock); - data->suspend_count--; -- hci_resume_dev(data->hdev); - return -EBUSY; - } - -@@ -4243,8 +4236,6 @@ static int btusb_resume(struct usb_interface *intf) - spin_unlock_irq(&data->txlock); - schedule_work(&data->work); - -- hci_resume_dev(data->hdev); -- - return 0; - - failed: diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c -index bbf7029e224b..cf7faa970dd6 100644 +index bbf7029e224be..cf7faa970dd65 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void) @@ -1092,7 +1025,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index e12b531f5c2f..082707f8dff8 100644 +index e12b531f5c2f3..082707f8dff8c 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -1127,7 +1060,7 @@ index e12b531f5c2f..082707f8dff8 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index a2d0009560d0..4f3486e6a84b 100644 +index a2d0009560d0f..4f3486e6a84b2 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -1139,7 +1072,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index fdf07dd6f459..cfd2b58a3494 100644 +index fdf07dd6f4591..cfd2b58a34940 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -1285,7 +1218,7 @@ index fdf07dd6f459..cfd2b58a3494 100644 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 000000000000..de0a3714a5d4 +index 0000000000000..de0a3714a5d44 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -1328,7 +1261,7 @@ index 000000000000..de0a3714a5d4 + } +} diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c -index e5e72aa5260a..24654c7ecb04 100644 +index e5e72aa5260a9..24654c7ecb04e 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -473,6 +473,7 @@ static int lenovo_input_mapping(struct hid_device *hdev, @@ -1389,7 +1322,7 @@ index e5e72aa5260a..24654c7ecb04 100644 }; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba46..154f0403cbf4 100644 +index d4af17fdba467..154f0403cbf4c 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) @@ -1491,7 +1424,7 @@ index d4af17fdba46..154f0403cbf4 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index bf01f01964cf..703896981e8a 100644 +index bf01f01964cf9..703896981e8ae 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -10,6 +10,7 @@ @@ -1542,7 +1475,7 @@ index bf01f01964cf..703896981e8a 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index 2168b6cd7167..5d7cda175a0c 100644 +index 2168b6cd71673..5d7cda175a0ce 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -1734,7 +1667,7 @@ index 2168b6cd7167..5d7cda175a0c 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index ed6c5cb60c5a..70cb770b78bb 100644 +index ed6c5cb60c5ae..70cb770b78bb3 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1774,7 +1707,7 @@ index ed6c5cb60c5a..70cb770b78bb 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c -index 02afeb3acce4..5aef7fa37878 100644 +index 02afeb3acce46..5aef7fa378788 100644 --- a/drivers/net/wireless/realtek/rtw89/pci.c +++ b/drivers/net/wireless/realtek/rtw89/pci.c @@ -3026,24 +3026,54 @@ static void rtw89_pci_declaim_device(struct rtw89_dev *rtwdev, @@ -1858,7 +1791,7 @@ index 02afeb3acce4..5aef7fa37878 100644 resource_len = pci_resource_len(pdev, bar_id); rtwpci->mmap = pci_iomap(pdev, bar_id, resource_len); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index dccb60c1d9cc..c7ec62f076c3 100644 +index dccb60c1d9cc3..c7ec62f076c31 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4452,6 +4452,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1893,7 +1826,7 @@ index dccb60c1d9cc..c7ec62f076c3 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 53896df7ec2b..98e08f10f60e 100644 +index 53896df7ec2bf..98e08f10f60ec 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -122,6 +122,14 @@ static const char *sd_cache_types[] = { @@ -1921,7 +1854,7 @@ index 53896df7ec2b..98e08f10f60e 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 4b93c0bd1d4b..b98906237306 100644 +index 4b93c0bd1d4bc..b98906237306d 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5844,6 +5844,13 @@ static void hub_event(struct work_struct *work) @@ -1939,7 +1872,7 @@ index 4b93c0bd1d4b..b98906237306 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/include/linux/crypto.h b/include/linux/crypto.h -index b164da5e129e..72bfb79b491d 100644 +index b164da5e129e8..72bfb79b491da 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -134,6 +134,8 @@ @@ -1952,7 +1885,7 @@ index b164da5e129e..72bfb79b491d 100644 * Miscellaneous stuff. */ diff --git a/include/linux/efi.h b/include/linux/efi.h -index 6bf3c4fe8511..67e5400f7644 100644 +index 6bf3c4fe85117..67e5400f76444 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -2020,7 +1953,7 @@ index 6bf3c4fe8511..67e5400f7644 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 19c333fafe11..db33ee7f55d5 100644 +index 19c333fafe113..db33ee7f55d54 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -439,6 +439,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -2033,7 +1966,7 @@ index 19c333fafe11..db33ee7f55d5 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab42..fff7c5f737fc 100644 +index ab7eea01ab427..fff7c5f737fc8 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -2045,7 +1978,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 1390f1efb4f0..b9a8ccb1dbdc 100644 +index 1390f1efb4f07..b9a8ccb1dbdcc 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -507,6 +507,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -2068,7 +2001,7 @@ index 1390f1efb4f0..b9a8ccb1dbdc 100644 u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags) diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623..f0d2be1ee4f1 100644 +index a2ff4242e623d..f0d2be1ee4f1c 100644 --- a/kernel/module/signing.c +++ b/kernel/module/signing.c @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -2091,7 +2024,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/sign-file.c b/scripts/sign-file.c -index 3edb156ae52c..0114ae1dbf7f 100644 +index 3edb156ae52c3..0114ae1dbf7ff 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -27,7 +27,6 @@ @@ -2145,7 +2078,7 @@ index 3edb156ae52c..0114ae1dbf7f 100644 BIO *b; diff --git a/scripts/tags.sh b/scripts/tags.sh -index 191e0461d6d5..e6f418b3e948 100755 +index 191e0461d6d5b..e6f418b3e948b 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -2158,7 +2091,7 @@ index 191e0461d6d5..e6f418b3e948 100755 # ignore arbitrary directories if [ -n "${IGNORE_DIRS}" ]; then diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c -index d1fdd113450a..182e8090cfe8 100644 +index d1fdd113450a6..182e8090cfe85 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, @@ -2182,7 +2115,7 @@ index d1fdd113450a..182e8090cfe8 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf484010..d0501353a4b9 100644 +index e84ddf4840101..d0501353a4b95 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -2206,7 +2139,7 @@ index e84ddf484010..d0501353a4b9 100644 prompt "Kernel default lockdown mode" default LOCK_DOWN_KERNEL_FORCE_NONE diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c -index cd84d8ea1dfb..e4c70a0312bc 100644 +index cd84d8ea1dfbf..e4c70a0312bc8 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what) @@ -2218,7 +2151,7 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 43166e341526..b8cf110aeb58 100644 +index 43166e341526c..b8cf110aeb589 100644 --- a/security/security.c +++ b/security/security.c @@ -5630,6 +5630,18 @@ int security_locked_down(enum lockdown_reason what) diff --git a/sources b/sources index d0f416bdb..476788fec 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11.4.tar.xz) = d0961ad6226c2c2477b46a88ee0db30cc105df80c5731ebbe4a8eb033360523e6677156266704148beed960b692510a092041708cdeeeb308b8969340f4b4ae2 -SHA512 (kernel-abi-stablelists-6.11.4.tar.xz) = 8df8d69876419e046208a58d338fee21d79aaf5a384704911d43cf30761d70be44566cd66a3f78ac9b93aebde3576c7c10e85571fdcb030dd4399e1af409a5af -SHA512 (kernel-kabi-dw-6.11.4.tar.xz) = 5e1466dba742d0bcaba094fff5fbdd43da7e87062114e25d47c5facb01eda19327adf6d2a673a2b726ff38d11ead2abc737c58d2a58d39fc2b7bcdda7e17fdb9 +SHA512 (linux-6.11.5.tar.xz) = 7439e2711d487c2951256ecd14c0023f1a9347f5d526b54ef79e574e8753fe5473338a0c65d95b84a51d2ab3a52611d2fd7c34cd8e47e36a9037b1d1ace5e3b7 +SHA512 (kernel-abi-stablelists-6.11.5.tar.xz) = ba3305f11f47add2704b4c80f47a3d457bbe43f855cef48d8a6fb40f3f14db48572d3b7ef9e67b39730acb8c9fb402c1502fbca63076f44b4eee138cd6158f0a +SHA512 (kernel-kabi-dw-6.11.5.tar.xz) = c3dd533a5875451784838482b6dfa073731a01c77b8e1072b436bc21d309588ebc2618ab762f13c1c92f275e1a742745134791378713a540e9cb7964ee7c5bc3