From a2ee2301995ddcf258c82be6d6b3a7996fae4f85 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 10 Jun 2025 08:40:34 -0600 Subject: [PATCH] kernel-6.15.2-200 * Tue Jun 10 2025 Justin M. Forbes [6.15.2-0] - Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes) - Reset build id for fedora-srpm script (Justin M. Forbes) - redhat/configs: Add configs for new ov02c10 and ov02e10 drivers (Hans de Goede) - media: i2c: Add Omnivision OV02C10 sensor driver (Heimir Thor Sverrisson) - media: i2c: ov02e10: add OV02E10 image sensor driver (Jingjing Xiong) - platform/x86: int3472: Debug log when remapping pins (Hans de Goede) - platform/x86: int3472: Add handshake pin support (Hans de Goede) - platform/x86: int3472: Prepare for registering more than 1 GPIO regulator (Hans de Goede) - platform/x86: int3472: Avoid GPIO regulator spikes (Hans de Goede) - platform/x86: int3472: Make regulator supply name configurable (Hans de Goede) - platform/x86: int3472: Rework AVDD second sensor quirk handling (Hans de Goede) - platform/x86: int3472: Drop unused gpio field from struct int3472_gpio_regulator (Hans de Goede) - platform/x86: int3472: Stop setting a supply-name for GPIO regulators (Hans de Goede) - platform/x86: int3472: Add skl_int3472_register_clock() helper (Hans de Goede) - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) - Initial setup for stable Fedora releases (Justin M. Forbes) - Reset RHEL_RELEASE for the 6.16 cycle (Justin M. Forbes) - fedora: add 'fedora' SBAT suffix for UKI addons (Li Tian) - redhat: add downstream SBAT for UKI addons (Emanuele Giuseppe Esposito) - uki_addons: provide custom SBAT as input parameter (Emanuele Giuseppe Esposito) - uki_addons: remove completely sbat/sbat.conf (Emanuele Giuseppe Esposito) - Linux v6.15.2 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 40 +---- kernel.changelog | 18 +- kernel.spec | 26 +-- patch-6.15-redhat.patch | 381 +++++----------------------------------- sources | 6 +- 5 files changed, 63 insertions(+), 408 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 2c87d3050..89d0aa976 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,41 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/d7909c16c62ed14251352afd2ac6a17246533c14 - d7909c16c62ed14251352afd2ac6a17246533c14 arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 - -https://gitlab.com/cki-project/kernel-ark/-/commit/f6fe2f2da41fd014a8d4a1b7275527706b9038e1 - f6fe2f2da41fd014a8d4a1b7275527706b9038e1 arm64: dts: rockchip: Improve LED config for NanoPi R5S - -https://gitlab.com/cki-project/kernel-ark/-/commit/f47c758ab8faa5cac82fcf47abf030258c0cd130 - f47c758ab8faa5cac82fcf47abf030258c0cd130 arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS - -https://gitlab.com/cki-project/kernel-ark/-/commit/b6aeff3f14aef90537e7182d613bf386ec5e8786 - b6aeff3f14aef90537e7182d613bf386ec5e8786 arm64: dts: rockchip: Update eMMC for NanoPi R5 series - -https://gitlab.com/cki-project/kernel-ark/-/commit/e2eedda3d3f2c4be70753804cf5431f817991772 - e2eedda3d3f2c4be70753804cf5431f817991772 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c - -https://gitlab.com/cki-project/kernel-ark/-/commit/af4f01cfac541cdfcdf3ee7a74804249d0a62a1a - af4f01cfac541cdfcdf3ee7a74804249d0a62a1a arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b - -https://gitlab.com/cki-project/kernel-ark/-/commit/bbf40beb1a9a3729b99101da133ae1ece5ee7ab1 - bbf40beb1a9a3729b99101da133ae1ece5ee7ab1 arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S - -https://gitlab.com/cki-project/kernel-ark/-/commit/22cebdf881b3d6fb20f2c9e0cc91f80ea359a105 - 22cebdf881b3d6fb20f2c9e0cc91f80ea359a105 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b - -https://gitlab.com/cki-project/kernel-ark/-/commit/09864738a9a39780a147c9cb94a8e1320116a712 - 09864738a9a39780a147c9cb94a8e1320116a712 arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64 - -https://gitlab.com/cki-project/kernel-ark/-/commit/43438a08982d340ae5e384a02b2bfb99aa22333e - 43438a08982d340ae5e384a02b2bfb99aa22333e arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64 - -https://gitlab.com/cki-project/kernel-ark/-/commit/c1f80e194a5d3bbfc66eaa55e65a00349ab15541 - c1f80e194a5d3bbfc66eaa55e65a00349ab15541 arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588 - -https://gitlab.com/cki-project/kernel-ark/-/commit/f3a28964ec84f5a742a9bf7d68d548370c734dc6 - f3a28964ec84f5a742a9bf7d68d548370c734dc6 arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433 - -https://gitlab.com/cki-project/kernel-ark/-/commit/f8201d5b071e16b72238977851c23982c8a72114 - f8201d5b071e16b72238977851c23982c8a72114 arm64: dts: rockchip: Correct gmac phy address on QNAP TS433 +https://gitlab.com/cki-project/kernel-ark/-/commit/360edb99bae1b906107ec7dbb0d5a5410306fccd + 360edb99bae1b906107ec7dbb0d5a5410306fccd Revert "drm/amd/display: more liberal vmin/vmax update for freesync" https://gitlab.com/cki-project/kernel-ark/-/commit/889cf0727884fcc305faed0ff3278555fc63ad02 889cf0727884fcc305faed0ff3278555fc63ad02 media: i2c: Add Omnivision OV02C10 sensor driver diff --git a/kernel.changelog b/kernel.changelog index 599207923..e3b9c9559 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,17 +1,5 @@ -* Wed Jun 04 2025 Justin M. Forbes [6.15.1-0] -- arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 (Diederik de Haas) -- arm64: dts: rockchip: Improve LED config for NanoPi R5S (Diederik de Haas) -- arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS (Chukun Pan) -- arm64: dts: rockchip: Update eMMC for NanoPi R5 series (Peter Robinson) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c (Peter Robinson) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b (Diederik de Haas) -- arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64 (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64 (Diederik de Haas) -- arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588 (Chukun Pan) -- arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433 (Uwe Kleine-König) -- arm64: dts: rockchip: Correct gmac phy address on QNAP TS433 (Uwe Kleine-König) +* Tue Jun 10 2025 Justin M. Forbes [6.15.2-0] +- Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes) - Reset build id for fedora-srpm script (Justin M. Forbes) - redhat/configs: Add configs for new ov02c10 and ov02e10 drivers (Hans de Goede) - media: i2c: Add Omnivision OV02C10 sensor driver (Heimir Thor Sverrisson) @@ -32,7 +20,7 @@ - redhat: add downstream SBAT for UKI addons (Emanuele Giuseppe Esposito) - uki_addons: provide custom SBAT as input parameter (Emanuele Giuseppe Esposito) - uki_addons: remove completely sbat/sbat.conf (Emanuele Giuseppe Esposito) -- Linux v6.15.1 +- Linux v6.15.2 Resolves: * Mon May 26 2025 Fedora Kernel Team [6.15.0-60] diff --git a/kernel.spec b/kernel.spec index c5d509f98..8a07d838e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.15.1 -%define specversion 6.15.1 +%define specrpmversion 6.15.2 +%define specversion 6.15.2 %define patchversion 6.15 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.15.1 +%define tarfile_release 6.15.2 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.15.1 +%define kabiversion 6.15.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4261,20 +4261,8 @@ fi\ # # %changelog -* Wed Jun 04 2025 Justin M. Forbes [6.15.1-0] -- arm64: dts: rockchip: Drop assigned-clock* from cpu nodes on rk3588 (Diederik de Haas) -- arm64: dts: rockchip: Improve LED config for NanoPi R5S (Diederik de Haas) -- arm64: dts: rockchip: Move rk3568 PCIe3 MSI to use GIC ITS (Chukun Pan) -- arm64: dts: rockchip: Update eMMC for NanoPi R5 series (Peter Robinson) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-rock3c (Peter Robinson) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3566-quartz64-b (Diederik de Haas) -- arm64: dts: rockchip: Add phy-supply to gmac0 on NanoPi R5S (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3588-rock-5b (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3399-rockpro64 (Diederik de Haas) -- arm64: dts: rockchip: Add vcc-supply to SPI flash on rk3328-rock64 (Diederik de Haas) -- arm64: dts: rockchip: Move SHMEM memory to reserved memory on rk3588 (Chukun Pan) -- arm64: dts: rockchip: Add gmac phy reset GPIO to QNAP TS433 (Uwe Kleine-König) -- arm64: dts: rockchip: Correct gmac phy address on QNAP TS433 (Uwe Kleine-König) +* Tue Jun 10 2025 Justin M. Forbes [6.15.2-0] +- Revert "drm/amd/display: more liberal vmin/vmax update for freesync" (Justin M. Forbes) - Reset build id for fedora-srpm script (Justin M. Forbes) - redhat/configs: Add configs for new ov02c10 and ov02e10 drivers (Hans de Goede) - media: i2c: Add Omnivision OV02C10 sensor driver (Heimir Thor Sverrisson) @@ -4295,7 +4283,7 @@ fi\ - redhat: add downstream SBAT for UKI addons (Emanuele Giuseppe Esposito) - uki_addons: provide custom SBAT as input parameter (Emanuele Giuseppe Esposito) - uki_addons: remove completely sbat/sbat.conf (Emanuele Giuseppe Esposito) -- Linux v6.15.1 +- Linux v6.15.2 * Mon May 26 2025 Fedora Kernel Team [6.15.0-60] - Consolidate configs to common for 6.15 (Justin M. Forbes) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index bcbcefc97..a86e2c2db 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -2,16 +2,6 @@ Makefile | 40 + arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- - arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 + - arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 1 + - arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 1 + - arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts | 1 + - arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 19 +- - .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 5 +- - arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 15 +- - arch/arm64/boot/dts/rockchip/rk3568.dtsi | 8 +- - arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 21 +- - arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 1 + arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + @@ -55,10 +45,10 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 57 files changed, 2730 insertions(+), 341 deletions(-) + 47 files changed, 2682 insertions(+), 316 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS -index dd844ac8d9107..dab2b48921221 100644 +index dd844ac8d910..dab2b4892122 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18014,6 +18014,23 @@ T: git git://linuxtv.org/media.git @@ -86,7 +76,7 @@ index dd844ac8d9107..dab2b48921221 100644 M: Jimmy Su L: linux-media@vger.kernel.org diff --git a/Makefile b/Makefile -index 61d69a3fc827c..a2d5af2ece231 100644 +index 7138d1fabfa4..1eb8ce53201b 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -151,7 +141,7 @@ index 61d69a3fc827c..a2d5af2ece231 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 25ed6f1a7c7ae..d19fc6d6c1347 100644 +index 25ed6f1a7c7a..d19fc6d6c134 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1232,9 +1232,9 @@ config HIGHMEM @@ -167,7 +157,7 @@ index 25ed6f1a7c7ae..d19fc6d6c1347 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index a182295e6f08b..a3cfce882d261 100644 +index a182295e6f08..a3cfce882d26 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1413,7 +1413,7 @@ endchoice @@ -179,283 +169,8 @@ index a182295e6f08b..a3cfce882d261 100644 help 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/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index e550b6eeeff31..5367e5fa92328 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -343,6 +343,7 @@ flash@0 { - - /* maximum speed for Rockchip SPI */ - spi-max-frequency = <50000000>; -+ vcc-supply = <&vcc_io>; - }; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -index 51c6aa26d8285..a7e4adf87e7a1 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi -@@ -850,6 +850,7 @@ flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; -+ vcc-supply = <&vcc_3v0>; - }; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts -index 5707321a1144f..f8cf033806365 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts -@@ -648,6 +648,7 @@ flash@0 { - spi-max-frequency = <24000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; -+ vcc-supply = <&vcc_1v8>; - }; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts -index 53e71528e4c4c..6224d72813e59 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts -@@ -636,6 +636,7 @@ flash@0 { - spi-max-frequency = <104000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; -+ vcc-supply = <&vcc_1v8>; - }; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts -index b6ad8328c7ebc..3b31f0dd8f3bc 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts -@@ -20,33 +20,43 @@ aliases { - gpio-leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; -- pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&power_led_pin>, <&wan_led_pin>; -+ pinctrl-0 = <&lan1_led_pin>, <&lan2_led_pin>, <&sys_led_pin>, <&wan_led_pin>; - - led-lan1 { - color = ; -+ default-state = "off"; - function = LED_FUNCTION_LAN; - function-enumerator = <1>; - gpios = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>; -+ label = "LAN-1"; -+ linux,default-trigger = "netdev"; - }; - - led-lan2 { - color = ; -+ default-state = "off"; - function = LED_FUNCTION_LAN; - function-enumerator = <2>; - gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>; -+ label = "LAN-2"; -+ linux,default-trigger = "netdev"; - }; - -- power_led: led-power { -+ power_led: led-sys { - color = ; - function = LED_FUNCTION_POWER; -- linux,default-trigger = "heartbeat"; - gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; -+ label = "SYS"; -+ linux,default-trigger = "heartbeat"; - }; - - led-wan { - color = ; -+ default-state = "off"; - function = LED_FUNCTION_WAN; - gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; -+ label = "WAN"; -+ linux,default-trigger = "netdev"; - }; - }; - }; -@@ -58,6 +68,7 @@ &gmac0 { - clock_in_out = "output"; - phy-handle = <&rgmii_phy0>; - phy-mode = "rgmii"; -+ phy-supply = <&vcc_3v3>; - pinctrl-names = "default"; - pinctrl-0 = <&gmac0_miim - &gmac0_tx_bus2 -@@ -125,7 +136,7 @@ lan2_led_pin: lan2-led-pin { - rockchip,pins = <3 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>; - }; - -- power_led_pin: power-led-pin { -+ sys_led_pin: sys-led-pin { - rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi -index 00c479aa18711..a28b4af10d13a 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi -@@ -486,9 +486,12 @@ &saradc { - &sdhci { - bus-width = <8>; - max-frequency = <200000000>; -+ mmc-hs200-1_8v; - non-removable; - pinctrl-names = "default"; -- pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; -+ pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; -+ vmmc-supply = <&vcc_3v3>; -+ vqmmc-supply = <&vcc_1v8>; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts -index b80d628c426b7..6ae4316761c43 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts -@@ -481,9 +481,14 @@ eeprom@56 { - }; - - &mdio0 { -- rgmii_phy0: ethernet-phy@0 { -+ rgmii_phy0: ethernet-phy@3 { -+ /* Motorcomm YT8521 phy */ - compatible = "ethernet-phy-ieee802.3-c22"; -- reg = <0x0>; -+ reg = <0x3>; -+ pinctrl-0 = <ð_phy0_reset_pin>; -+ pinctrl-names = "default"; -+ reset-assert-us = <10000>; -+ reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>; - }; - }; - -@@ -556,6 +561,12 @@ &pcie3x2 { - }; - - &pinctrl { -+ gmac0 { -+ eth_phy0_reset_pin: eth-phy0-reset-pin { -+ rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ - keys { - copy_button_pin: copy-button-pin { - rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>; -diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -index 695cccbdab0f9..e719a3df126c5 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi -@@ -152,7 +152,7 @@ pcie3x1: pcie@fe270000 { - compatible = "rockchip,rk3568-pcie"; - #address-cells = <3>; - #size-cells = <2>; -- bus-range = <0x0 0xf>; -+ bus-range = <0x10 0x1f>; - clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, - <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, - <&cru CLK_PCIE30X1_AUX_NDFT>; -@@ -175,7 +175,7 @@ pcie3x1: pcie@fe270000 { - num-ib-windows = <6>; - num-ob-windows = <2>; - max-link-speed = <3>; -- msi-map = <0x0 &gic 0x1000 0x1000>; -+ msi-map = <0x1000 &its 0x1000 0x1000>; - num-lanes = <1>; - phys = <&pcie30phy>; - phy-names = "pcie-phy"; -@@ -205,7 +205,7 @@ pcie3x2: pcie@fe280000 { - compatible = "rockchip,rk3568-pcie"; - #address-cells = <3>; - #size-cells = <2>; -- bus-range = <0x0 0xf>; -+ bus-range = <0x20 0x2f>; - clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, - <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, - <&cru CLK_PCIE30X2_AUX_NDFT>; -@@ -228,7 +228,7 @@ pcie3x2: pcie@fe280000 { - num-ib-windows = <6>; - num-ob-windows = <2>; - max-link-speed = <3>; -- msi-map = <0x0 &gic 0x2000 0x1000>; -+ msi-map = <0x2000 &its 0x2000 0x1000>; - num-lanes = <2>; - phys = <&pcie30phy>; - phy-names = "pcie-phy"; -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -index 1e18ad93ba0eb..5d8b96384856b 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -95,8 +95,6 @@ cpu_l0: cpu@0 { - enable-method = "psci"; - capacity-dmips-mhz = <530>; - clocks = <&scmi_clk SCMI_CLK_CPUL>; -- assigned-clocks = <&scmi_clk SCMI_CLK_CPUL>; -- assigned-clock-rates = <816000000>; - cpu-idle-states = <&CPU_SLEEP>; - i-cache-size = <32768>; - i-cache-line-size = <64>; -@@ -173,8 +171,6 @@ cpu_b0: cpu@400 { - enable-method = "psci"; - capacity-dmips-mhz = <1024>; - clocks = <&scmi_clk SCMI_CLK_CPUB01>; -- assigned-clocks = <&scmi_clk SCMI_CLK_CPUB01>; -- assigned-clock-rates = <816000000>; - cpu-idle-states = <&CPU_SLEEP>; - i-cache-size = <65536>; - i-cache-line-size = <64>; -@@ -213,8 +209,6 @@ cpu_b2: cpu@600 { - enable-method = "psci"; - capacity-dmips-mhz = <1024>; - clocks = <&scmi_clk SCMI_CLK_CPUB23>; -- assigned-clocks = <&scmi_clk SCMI_CLK_CPUB23>; -- assigned-clock-rates = <816000000>; - cpu-idle-states = <&CPU_SLEEP>; - i-cache-size = <65536>; - i-cache-line-size = <64>; -@@ -439,16 +433,15 @@ xin32k: clock-2 { - #clock-cells = <0>; - }; - -- pmu_sram: sram@10f000 { -- compatible = "mmio-sram"; -- reg = <0x0 0x0010f000 0x0 0x100>; -- ranges = <0 0x0 0x0010f000 0x100>; -- #address-cells = <1>; -- #size-cells = <1>; -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; - -- scmi_shmem: sram@0 { -+ scmi_shmem: shmem@10f000 { - compatible = "arm,scmi-shmem"; -- reg = <0x0 0x100>; -+ reg = <0x0 0x0010f000 0x0 0x100>; -+ no-map; - }; - }; - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -index d22068475c5dc..17f4fd054cd3d 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -562,6 +562,7 @@ flash@0 { - spi-max-frequency = <104000000>; - spi-rx-bus-width = <4>; - spi-tx-bus-width = <1>; -+ vcc-supply = <&vcc_3v3_s3>; - }; - }; - diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h -index 2c145da3b774a..b5211e413829a 100644 +index 2c145da3b774..b5211e413829 100644 --- a/arch/powerpc/include/uapi/asm/ioctls.h +++ b/arch/powerpc/include/uapi/asm/ioctls.h @@ -23,10 +23,10 @@ @@ -474,7 +189,7 @@ index 2c145da3b774a..b5211e413829a 100644 #define TCSBRK _IO('t', 29) #define TCXONC _IO('t', 30) diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h -index b0d00032479d6..afb9544fb0074 100644 +index b0d00032479d..afb9544fb007 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, @@ -486,7 +201,7 @@ index b0d00032479d6..afb9544fb0074 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 3b9d9ccfad63e..648ac8c7e1fd9 100644 +index 3b9d9ccfad63..648ac8c7e1fd 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2498,3 +2498,8 @@ int ipl_report_free(struct ipl_report *report) @@ -499,7 +214,7 @@ index 3b9d9ccfad63e..648ac8c7e1fd9 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index f244c5560e7f6..464f915011b8a 100644 +index f244c5560e7f..464f915011b8 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -521,7 +236,7 @@ index f244c5560e7f6..464f915011b8a 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 9d2a13b37833c..770aee4ae9aee 100644 +index 9d2a13b37833..770aee4ae9ae 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -568,7 +283,7 @@ index 9d2a13b37833c..770aee4ae9aee 100644 reserve_initrd(); diff --git a/crypto/sig.c b/crypto/sig.c -index dfc7cae908028..2a58d726149db 100644 +index dfc7cae90802..2a58d726149d 100644 --- a/crypto/sig.c +++ b/crypto/sig.c @@ -106,8 +106,7 @@ static int sig_prepare_alg(struct sig_alg *alg) @@ -582,7 +297,7 @@ index dfc7cae908028..2a58d726149db 100644 alg->verify = sig_default_verify; if (!alg->set_priv_key) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 82977ea25db39..aeb84a4b59371 100644 +index 82977ea25db3..aeb84a4b5937 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4170,7 +4170,7 @@ static int test_sig_one(struct crypto_sig *tfm, const struct sig_testvec *vecs) @@ -595,7 +310,7 @@ index 82977ea25db39..aeb84a4b59371 100644 sig_size = crypto_sig_maxsize(tfm); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 20d757687e3d9..90a13f20f052b 100644 +index 20d757687e3d..90a13f20f052 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) @@ -614,7 +329,7 @@ index 20d757687e3d9..90a13f20f052b 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 1687483ff319e..390b67f19181a 100644 +index 1687483ff319..390b67f19181 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -657,7 +372,7 @@ index 1687483ff319e..390b67f19181a 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index fb1fe9f3b1a36..5a3312fc0ea01 100644 +index fb1fe9f3b1a3..5a3312fc0ea0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1794,6 +1794,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -677,7 +392,7 @@ index fb1fe9f3b1a36..5a3312fc0ea01 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 22afa4ff860d1..78eacccaa1ae8 100644 +index 22afa4ff860d..78eacccaa1ae 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -730,6 +730,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -706,7 +421,7 @@ index 22afa4ff860d1..78eacccaa1ae8 100644 tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c -index bbf7029e224be..cf7faa970dd65 100644 +index bbf7029e224b..cf7faa970dd6 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) @@ -732,7 +447,7 @@ index bbf7029e224be..cf7faa970dd65 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 3ba9d7e9a6c7c..82300dc5fd499 100644 +index 3ba9d7e9a6c7..82300dc5fd49 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -35,6 +35,7 @@ @@ -767,7 +482,7 @@ index 3ba9d7e9a6c7c..82300dc5fd499 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile -index a2d0009560d0f..4f3486e6a84b2 100644 +index a2d0009560d0..4f3486e6a84b 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -779,7 +494,7 @@ index a2d0009560d0f..4f3486e6a84b2 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 7309394b8fc98..d9f7cbba5769d 100644 +index 7309394b8fc9..d9f7cbba5769 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -925,7 +640,7 @@ index 7309394b8fc98..d9f7cbba5769d 100644 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c new file mode 100644 -index 0000000000000..de0a3714a5d44 +index 000000000000..de0a3714a5d4 --- /dev/null +++ b/drivers/firmware/efi/secureboot.c @@ -0,0 +1,38 @@ @@ -968,7 +683,7 @@ index 0000000000000..de0a3714a5d44 + } +} diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c -index d4af17fdba467..154f0403cbf4c 100644 +index d4af17fdba46..154f0403cbf4 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) @@ -1070,7 +785,7 @@ index d4af17fdba467..154f0403cbf4c 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 2b8f104638402..b2c08e0bf594f 100644 +index 2b8f10463840..b2c08e0bf594 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -11,6 +11,7 @@ @@ -1121,7 +836,7 @@ index 2b8f104638402..b2c08e0bf594f 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 2168b6cd71673..5d7cda175a0ce 100644 +index 2168b6cd7167..5d7cda175a0c 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, @@ -1313,7 +1028,7 @@ index 2168b6cd71673..5d7cda175a0ce 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 5bc2fc969494f..1eb06910746ab 100644 +index 5bc2fc969494..1eb06910746a 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1353,7 +1068,7 @@ index 5bc2fc969494f..1eb06910746ab 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index e45ba127069fc..7617a6dd2e2f2 100644 +index e45ba127069f..7617a6dd2e2f 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -356,6 +356,26 @@ config VIDEO_OV02A10 @@ -1384,7 +1099,7 @@ index e45ba127069fc..7617a6dd2e2f2 100644 tristate "OmniVision OV08D10 sensor support" help diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index 6c23a4463527c..1b577e5ebc73c 100644 +index 6c23a4463527..1b577e5ebc73 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -83,6 +83,8 @@ obj-$(CONFIG_VIDEO_MT9V111) += mt9v111.o @@ -1398,7 +1113,7 @@ index 6c23a4463527c..1b577e5ebc73c 100644 obj-$(CONFIG_VIDEO_OV13858) += ov13858.o diff --git a/drivers/media/i2c/ov02c10.c b/drivers/media/i2c/ov02c10.c new file mode 100644 -index 0000000000000..9e3d4a4e12ced +index 000000000000..9e3d4a4e12ce --- /dev/null +++ b/drivers/media/i2c/ov02c10.c @@ -0,0 +1,1013 @@ @@ -2417,7 +2132,7 @@ index 0000000000000..9e3d4a4e12ced +MODULE_LICENSE("GPL"); diff --git a/drivers/media/i2c/ov02e10.c b/drivers/media/i2c/ov02e10.c new file mode 100644 -index 0000000000000..d74dc62e189db +index 000000000000..d74dc62e189d --- /dev/null +++ b/drivers/media/i2c/ov02e10.c @@ -0,0 +1,969 @@ @@ -3391,7 +3106,7 @@ index 0000000000000..d74dc62e189db +MODULE_DESCRIPTION("OmniVision OV02E10 sensor driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c -index cf0e41fc30719..54575eea3c490 100644 +index cf0e41fc3071..54575eea3c49 100644 --- a/drivers/media/i2c/ov08x40.c +++ b/drivers/media/i2c/ov08x40.c @@ -1341,7 +1341,7 @@ static int ov08x40_power_on(struct device *dev) @@ -3404,7 +3119,7 @@ index cf0e41fc30719..54575eea3c490 100644 return 0; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 94daca15a096f..8de27d1098208 100644 +index 94daca15a096..8de27d109820 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4452,6 +4452,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -3439,7 +3154,7 @@ index 94daca15a096f..8de27d1098208 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/platform/x86/intel/int3472/Makefile b/drivers/platform/x86/intel/int3472/Makefile -index a8aba07bf1dc2..103661e6685d0 100644 +index a8aba07bf1dc..103661e6685d 100644 --- a/drivers/platform/x86/intel/int3472/Makefile +++ b/drivers/platform/x86/intel/int3472/Makefile @@ -1,7 +1,8 @@ @@ -3453,7 +3168,7 @@ index a8aba07bf1dc2..103661e6685d0 100644 intel_skl_int3472_common-y += common.o diff --git a/drivers/platform/x86/intel/int3472/clk_and_regulator.c b/drivers/platform/x86/intel/int3472/clk_and_regulator.c -index 16e36ac0a7b45..c85cbfbc16c18 100644 +index 16e36ac0a7b4..c85cbfbc16c1 100644 --- a/drivers/platform/x86/intel/int3472/clk_and_regulator.c +++ b/drivers/platform/x86/intel/int3472/clk_and_regulator.c @@ -5,7 +5,6 @@ @@ -3691,7 +3406,7 @@ index 16e36ac0a7b45..c85cbfbc16c18 100644 + regulator_unregister(int3472->regulators[i].rdev); } diff --git a/drivers/platform/x86/intel/int3472/common.h b/drivers/platform/x86/intel/int3472/common.h -index 145dec66df64a..51b818e62a252 100644 +index 145dec66df64..51b818e62a25 100644 --- a/drivers/platform/x86/intel/int3472/common.h +++ b/drivers/platform/x86/intel/int3472/common.h @@ -22,25 +22,39 @@ @@ -3814,7 +3529,7 @@ index 145dec66df64a..51b818e62a252 100644 int skl_int3472_register_pled(struct int3472_discrete_device *int3472, struct gpio_desc *gpio); diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c -index 30ff8f3ea1f53..394975f55d645 100644 +index 30ff8f3ea1f5..394975f55d64 100644 --- a/drivers/platform/x86/intel/int3472/discrete.c +++ b/drivers/platform/x86/intel/int3472/discrete.c @@ -5,6 +5,7 @@ @@ -3933,7 +3648,7 @@ index 30ff8f3ea1f53..394975f55d645 100644 if (ret) diff --git a/drivers/platform/x86/intel/int3472/discrete_quirks.c b/drivers/platform/x86/intel/int3472/discrete_quirks.c new file mode 100644 -index 0000000000000..bf88863803b2c +index 000000000000..bf88863803b2 --- /dev/null +++ b/drivers/platform/x86/intel/int3472/discrete_quirks.c @@ -0,0 +1,22 @@ @@ -3960,7 +3675,7 @@ index 0000000000000..bf88863803b2c + { } +}; diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 950d8c9fb8843..77ac6f8c18054 100644 +index 950d8c9fb884..77ac6f8c1805 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -3988,7 +3703,7 @@ index 950d8c9fb8843..77ac6f8c18054 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0e1dd6ef60a71..20ddc50a241c1 100644 +index 0e1dd6ef60a7..20ddc50a241c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5854,6 +5854,13 @@ static void hub_event(struct work_struct *work) @@ -4006,7 +3721,7 @@ index 0e1dd6ef60a71..20ddc50a241c1 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 7d63d1d75f22f..c7481fdedbddb 100644 +index 7d63d1d75f22..c7481fdedbdd 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -4074,7 +3789,7 @@ index 7d63d1d75f22f..c7481fdedbddb 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 bf3bbac4e02a5..b9840b1a43fed 100644 +index bf3bbac4e02a..b9840b1a43fe 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -444,6 +444,7 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -4086,7 +3801,7 @@ index bf3bbac4e02a5..b9840b1a43fed 100644 LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index ab7eea01ab427..fff7c5f737fc8 100644 +index ab7eea01ab42..fff7c5f737fc 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -4098,7 +3813,7 @@ index ab7eea01ab427..fff7c5f737fc8 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index cc9b54d95d22c..fce0e3457cf75 100644 +index cc9b54d95d22..fce0e3457cf7 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2390,4 +2390,13 @@ static inline void security_initramfs_populated(void) @@ -4116,7 +3831,7 @@ index cc9b54d95d22c..fce0e3457cf75 100644 + #endif /* ! __LINUX_SECURITY_H */ diff --git a/kernel/module/signing.c b/kernel/module/signing.c -index a2ff4242e623d..f0d2be1ee4f1c 100644 +index a2ff4242e623..f0d2be1ee4f1 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) @@ -4139,7 +3854,7 @@ index a2ff4242e623d..f0d2be1ee4f1c 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 2fe73cda0bddb..f766681e1b5ca 100644 +index 2fe73cda0bdd..f766681e1b5c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -272,7 +272,10 @@ objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE) += --static-call @@ -4154,7 +3869,7 @@ index 2fe73cda0bddb..f766681e1b5ca 100644 objtool-args = $(objtool-args-y) \ $(if $(delay-objtool), --link) \ diff --git a/scripts/tags.sh b/scripts/tags.sh -index 98680e9cd7be3..0880675cf5172 100755 +index 98680e9cd7be..0880675cf517 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi @@ -4167,7 +3882,7 @@ index 98680e9cd7be3..0880675cf5172 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 d1fdd113450a6..182e8090cfe85 100644 +index d1fdd113450a..182e8090cfe8 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, @@ -4191,7 +3906,7 @@ index d1fdd113450a6..182e8090cfe85 100644 } diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig -index e84ddf4840101..d0501353a4b95 100644 +index e84ddf484010..d0501353a4b9 100644 --- a/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -4215,7 +3930,7 @@ index e84ddf4840101..d0501353a4b95 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 cf83afa1d879a..aba751e7abffe 100644 +index cf83afa1d879..aba751e7abff 100644 --- a/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c @@ -72,6 +72,17 @@ static int lockdown_is_locked_down(enum lockdown_reason what) diff --git a/sources b/sources index 9d28bb463..8fdd99e2a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15.1.tar.xz) = cf16e3f11e2595348513ecb4f9c55d6436ff069beaccf31e1dd2f5dfc893e27d6b943344f4a3d5647afc9a483efeb60347569771def4fc2138e1ef6c02641b63 -SHA512 (kernel-abi-stablelists-6.15.1.tar.xz) = ccd750b01c8b251a559496108f54ce1fb63d239e4f351d8a235a2e751e4861940081cfd8d42ff6a825597c0a01153e5ff3ce1a73373b6b16dced3b1e8ee69de6 -SHA512 (kernel-kabi-dw-6.15.1.tar.xz) = 86cbb6c36ddf760e222a167d9be8ee3f434bd76401a730ae3372201d884bf128cd2502fdc6ebe2bdca437b70f21a952de3c5a1844fc7eb3d076117cfee7a08cc +SHA512 (linux-6.15.2.tar.xz) = 3b2f701bafcb336d412a6c99c4651191edec506e6c406efe3780fba09f10b3a5b9bd4469870cf59e2a66ae4545f9ea07a57480660ebfd3c378c4da7c5b9a9fbf +SHA512 (kernel-abi-stablelists-6.15.2.tar.xz) = d89cbc60ccd58906f0e88cd9a1911269439b8899a8f13ee80349f70183f6187f77e34ca39033c003e77a38ef1bb73b78eb80911bdca6c5b8297a01a28f5674d7 +SHA512 (kernel-kabi-dw-6.15.2.tar.xz) = 5fa391a89c61ceff78a1d6d18bfa6f3506d402cdc346b4d792a87f1a5910c8c7081b4770ffabd5ec06128fcc849fb19ebcc0efd3b8dc10fb49a498c11a8a3c98