rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.12.5-200

Browse Source 
* Sun Dec 15 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.5-0]
- New config item for 6.12.5 (Justin M. Forbes)
- x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR  implementation (Mark Pearson) [2332094]
- Add a bug to BugsFixed (Justin M. Forbes)
- Turn off libbpf dynamic for perf on f40 (Justin M. Forbes)
- Linux v6.12.5
Resolves: rhbz#2332094

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-12-15 09:18:02 -07:00
parent 677c158127
commit 84da1a7eeb
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
19 changed files with 101 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Patchlist.changelog
View File

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/a6f946b225152d6db15b0d632730b07edb03d7d5
a6f946b225152d6db15b0d632730b07edb03d7d5 x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation
https://gitlab.com/cki-project/kernel-ark/-/commit/45dbf0ddf79ac2b6962834712c13533ba58b2465 https://gitlab.com/cki-project/kernel-ark/-/commit/45dbf0ddf79ac2b6962834712c13533ba58b2465
45dbf0ddf79ac2b6962834712c13533ba58b2465 wifi: rtl8xxxu: add more missing rtl8192cu USB IDs 45dbf0ddf79ac2b6962834712c13533ba58b2465 wifi: rtl8xxxu: add more missing rtl8192cu USB IDs

1
kernel-aarch64-16k-debug-fedora.config
View File

@ -3102,6 +3102,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-16k-fedora.config
View File

@ -3085,6 +3085,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-64k-debug-rhel.config
View File

@ -2531,6 +2531,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-64k-rhel.config
View File

@ -2515,6 +2515,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-automotive-debug-rhel.config
View File

@ -2699,6 +2699,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
# CONFIG_HISILICON_IRQ_MBIGEN is not set # CONFIG_HISILICON_IRQ_MBIGEN is not set
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-automotive-rhel.config
View File

@ -2683,6 +2683,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
# CONFIG_HISILICON_IRQ_MBIGEN is not set # CONFIG_HISILICON_IRQ_MBIGEN is not set
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-debug-fedora.config
View File

@ -3102,6 +3102,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-debug-rhel.config
View File

@ -2528,6 +2528,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-fedora.config
View File

@ -3085,6 +3085,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-rhel.config
View File

@ -2512,6 +2512,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-rt-debug-fedora.config
View File

@ -3107,6 +3107,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-rt-debug-rhel.config
View File

@ -2569,6 +2569,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-rt-fedora.config
View File

@ -3090,6 +3090,7 @@ CONFIG_HISI_DMA=m
CONFIG_HISI_HIKEY_USB=m CONFIG_HISI_HIKEY_USB=m
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

1
kernel-aarch64-rt-rhel.config
View File

@ -2553,6 +2553,7 @@ CONFIG_HIPERDISPATCH_ON=y
# CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISI_HIKEY_USB is not set
CONFIG_HISILICON_ERRATUM_161010101=y CONFIG_HISILICON_ERRATUM_161010101=y
CONFIG_HISILICON_ERRATUM_161600802=y CONFIG_HISILICON_ERRATUM_161600802=y
CONFIG_HISILICON_ERRATUM_162100801=y
CONFIG_HISILICON_IRQ_MBIGEN=y CONFIG_HISILICON_IRQ_MBIGEN=y
CONFIG_HISILICON_LPC=y CONFIG_HISILICON_LPC=y
# CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set

8
kernel.changelog
View File

@ -1,3 +1,11 @@
* Sun Dec 15 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.5-0]
- New config item for 6.12.5 (Justin M. Forbes)
- x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation (Mark Pearson) [2332094]
- Add a bug to BugsFixed (Justin M. Forbes)
- Turn off libbpf dynamic for perf on f40 (Justin M. Forbes)
- Linux v6.12.5
Resolves: rhbz#2332094
* Mon Dec 09 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.4-0] * Mon Dec 09 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.4-0]
- Fix up QCOM_EMAC config for Fedora (Justin M. Forbes) - Fix up QCOM_EMAC config for Fedora (Justin M. Forbes)
- wifi: rtl8xxxu: add more missing rtl8192cu USB IDs (Hans de Goede) - wifi: rtl8xxxu: add more missing rtl8192cu USB IDs (Hans de Goede)

15
kernel.spec
View File

@ -159,18 +159,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 1 %define debugbuildsenabled 1
# define buildid .local # define buildid .local
%define specrpmversion 6.12.4 %define specrpmversion 6.12.5
%define specversion 6.12.4 %define specversion 6.12.5
%define patchversion 6.12 %define patchversion 6.12
%define pkgrelease 200 %define pkgrelease 200
%define kversion 6 %define kversion 6
%define tarfile_release 6.12.4 %define tarfile_release 6.12.5
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 12 %define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 200%{?buildid}%{?dist} %define specrelease 200%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.12.4 %define kabiversion 6.12.5
# If this variable is set to 1, a bpf selftests build failure will cause a # If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error # fatal kernel package build error
@ -4164,6 +4164,13 @@ fi\
# #
# #
%changelog %changelog
* Sun Dec 15 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.5-0]
- New config item for 6.12.5 (Justin M. Forbes)
- x86/cpu: Add Lunar Lake to list of CPUs with a broken MONITOR implementation (Mark Pearson) [2332094]
- Add a bug to BugsFixed (Justin M. Forbes)
- Turn off libbpf dynamic for perf on f40 (Justin M. Forbes)
- Linux v6.12.5
* Mon Dec 09 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.4-0] * Mon Dec 09 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.12.4-0]
- Fix up QCOM_EMAC config for Fedora (Justin M. Forbes) - Fix up QCOM_EMAC config for Fedora (Justin M. Forbes)
- wifi: rtl8xxxu: add more missing rtl8192cu USB IDs (Hans de Goede) - wifi: rtl8xxxu: add more missing rtl8192cu USB IDs (Hans de Goede)

196
patch-6.12-redhat.patch
View File

@ -49,18 +49,16 @@
include/linux/rmi.h | 1 + include/linux/rmi.h | 1 +
include/linux/security.h | 5 + include/linux/security.h | 5 +
kernel/module/signing.c | 9 +- kernel/module/signing.c | 9 +-
net/ipv4/udp.c | 14 +-
scripts/tags.sh | 2 + scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +- security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 12 + security/security.c | 12 +
tools/tracing/rtla/src/utils.c | 36 +- tools/tracing/rtla/src/utils.c | 32 +-
tools/tracing/rtla/src/utils.h | 2 + 57 files changed, 3004 insertions(+), 262 deletions(-)
59 files changed, 3011 insertions(+), 275 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 87dc2f810860..3e3b75cc9921 100644 index f158bfe6407ac..aaea72413c7d1 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -100,7 +98,7 @@ index 87dc2f810860..3e3b75cc9921 100644
ifdef mixed-build ifdef mixed-build
# =========================================================================== # ===========================================================================
# We're called with mixed targets (*config and build targets). # We're called with mixed targets (*config and build targets).
@@ -1859,6 +1882,23 @@ endif @@ -1860,6 +1883,23 @@ endif
ifdef CONFIG_MODULES ifdef CONFIG_MODULES
@ -125,7 +123,7 @@ index 87dc2f810860..3e3b75cc9921 100644
@: @:
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 202397be76d8..3d4ba33d4305 100644 index 202397be76d80..3d4ba33d4305f 100644
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1228,9 +1228,9 @@ config HIGHMEM @@ -1228,9 +1228,9 @@ config HIGHMEM
@ -141,10 +139,10 @@ index 202397be76d8..3d4ba33d4305 100644
The VM uses one page of physical memory for each page table. 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 For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 22f8a7bca6d2..a9e2b0c90cc7 100644 index a11a7a42edbfb..86ed0ce54f26f 100644
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1383,7 +1383,7 @@ endchoice @@ -1394,7 +1394,7 @@ endchoice
config ARM64_FORCE_52BIT config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace" bool "Force 52-bit virtual addresses for userspace"
@ -154,7 +152,7 @@ index 22f8a7bca6d2..a9e2b0c90cc7 100644
For systems with 52-bit userspace VAs enabled, the kernel will attempt For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs to maintain compatibility with older software by providing 48-bit VAs
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
index 2926a1aba768..32f76df73dfa 100644 index 2926a1aba7687..32f76df73dfa6 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
@@ -328,6 +328,14 @@ vreg_l3j_0p8: ldo3 { @@ -328,6 +328,14 @@ vreg_l3j_0p8: ldo3 {
@ -173,7 +171,7 @@ index 2926a1aba768..32f76df73dfa 100644
clock-frequency = <400000>; clock-frequency = <400000>;
status = "okay"; status = "okay";
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index fc67585b64b7..a337f3fb8377 100644 index fc67585b64b7b..a337f3fb8377e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1370,6 +1370,47 @@ i2s9_8ch: i2s@fddfc000 { @@ -1370,6 +1370,47 @@ i2s9_8ch: i2s@fddfc000 {
@ -225,7 +223,7 @@ index fc67585b64b7..a337f3fb8377 100644
compatible = "rockchip,rk3588-qos", "syscon"; compatible = "rockchip,rk3588-qos", "syscon";
reg = <0x0 0xfdf35000 0x0 0x20>; reg = <0x0 0xfdf35000 0x0 0x20>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index 00f660d50127..7cf51a55863c 100644 index 00f660d50127f..7cf51a55863c0 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
@ -301,7 +299,7 @@ index 00f660d50127..7cf51a55863c 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
index 83103e4c7216..dcc2c872b6c2 100644 index 83103e4c7216f..dcc2c872b6c28 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -377,7 +375,7 @@ index 83103e4c7216..dcc2c872b6c2 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index fc131789b4c3..35d5d9f0c477 100644 index fc131789b4c32..35d5d9f0c477f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -453,7 +451,7 @@ index fc131789b4c3..35d5d9f0c477 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
index dd4c79bcad87..f6202321b5c0 100644 index dd4c79bcad87f..f6202321b5c09 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
@ -529,7 +527,7 @@ index dd4c79bcad87..f6202321b5c0 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 6bd06e46a101..7cbd7a5e1aa1 100644 index 6bd06e46a101d..7cbd7a5e1aa16 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
@ -605,7 +603,7 @@ index 6bd06e46a101..7cbd7a5e1aa1 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
index 63d91236ba9f..8f034c6d494c 100644 index 63d91236ba9ff..8f034c6d494c4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
@ -681,7 +679,7 @@ index 63d91236ba9f..8f034c6d494c 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index 6b77be643249..7052641144e1 100644 index 6b77be6432495..7052641144e19 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
@ -757,7 +755,7 @@ index 6b77be643249..7052641144e1 100644
+ }; + };
+}; +};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
index 294b99dd50da..41e64a44e964 100644 index 294b99dd50da2..41e64a44e964b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
@ -850,7 +848,7 @@ index 294b99dd50da..41e64a44e964 100644
+ }; + };
+}; +};
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h 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 --- a/arch/s390/include/asm/ipl.h
+++ b/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, @@ -139,6 +139,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,
@ -862,7 +860,7 @@ index b0d00032479d..afb9544fb007 100644
/* /*
* DIAG 308 support * DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c 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 --- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c
@@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report) @@ -2479,3 +2479,8 @@ int ipl_report_free(struct ipl_report *report)
@ -875,7 +873,7 @@ index f17bb7bf9392..66e530380ee3 100644
+ return !!ipl_secure_flag; + return !!ipl_secure_flag;
+} +}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c 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 --- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
@ -897,7 +895,7 @@ index a3fea683b227..a3162d93f437 100644
/* boot_command_line has been already set up in early.c */ /* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line; *cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f1fea506e20f..6af50d80f54a 100644 index f1fea506e20f4..6af50d80f54aa 100644
--- a/arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -944,7 +942,7 @@ index f1fea506e20f..6af50d80f54a 100644
reserve_initrd(); reserve_initrd();
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c 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 --- a/drivers/acpi/apei/hest.c
+++ b/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) @@ -142,6 +142,14 @@ static int apei_hest_parse(apei_hest_func_t func, void *data)
@ -963,7 +961,7 @@ index 20d757687e3d..90a13f20f052 100644
for (i = 0; i < hest_tab->error_source_count; i++) { for (i = 0; i < hest_tab->error_source_count; i++) {
len = hest_esrc_len(hest_hdr); len = hest_esrc_len(hest_hdr);
diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c 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 --- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c
@@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { @@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx {
@ -1006,7 +1004,7 @@ index 1687483ff319..390b67f19181 100644
return ctx.rc; return ctx.rc;
} }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7ecc401fb97f..52917b177122 100644 index 7ecc401fb97f9..52917b1771227 100644
--- a/drivers/acpi/scan.c --- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c
@@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
@ -1026,7 +1024,7 @@ index 7ecc401fb97f..52917b177122 100644
acpi_dev_get_resources(device, &resource_list, acpi_dev_get_resources(device, &resource_list,
acpi_check_serial_bus_slave, acpi_check_serial_bus_slave,
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c 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 --- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c
@@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap) @@ -729,6 +729,24 @@ int ahci_stop_engine(struct ata_port *ap)
@ -1055,7 +1053,7 @@ index fdfa7b266218..f5f8ba457c93 100644
tmp = ata_wait_register(ap, port_mmio + PORT_CMD, tmp = ata_wait_register(ap, port_mmio + PORT_CMD,
PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500);
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 4ccaddb46ddd..94689b7e06a2 100644 index 11755cb1eb163..202d43563e0bc 100644
--- a/drivers/bluetooth/btusb.c --- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c
@@ -295,6 +295,8 @@ static const struct usb_device_id quirks_table[] = { @@ -295,6 +295,8 @@ static const struct usb_device_id quirks_table[] = {
@ -1068,7 +1066,7 @@ index 4ccaddb46ddd..94689b7e06a2 100644
/* QCA WCN6855 chipset */ /* QCA WCN6855 chipset */
{ USB_DEVICE(0x0cf3, 0xe600), .driver_info = BTUSB_QCA_WCN6855 | { USB_DEVICE(0x0cf3, 0xe600), .driver_info = BTUSB_QCA_WCN6855 |
diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c 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 --- a/drivers/char/ipmi/ipmi_dmi.c
+++ b/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) @@ -215,6 +215,21 @@ static int __init scan_for_dmi_ipmi(void)
@ -1094,7 +1092,7 @@ index bbf7029e224b..cf7faa970dd6 100644
dmi_decode_ipmi((const struct dmi_header *) dev->device_data); 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 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 --- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
@ -1129,7 +1127,7 @@ index e12b531f5c2f..082707f8dff8 100644
rv = ipmi_register_driver(); rv = ipmi_register_driver();
mutex_unlock(&ipmi_interfaces_mutex); mutex_unlock(&ipmi_interfaces_mutex);
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile 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 --- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile
@@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub @@ -25,6 +25,7 @@ subdir-$(CONFIG_EFI_STUB) += libstub
@ -1141,7 +1139,7 @@ index a2d0009560d0..4f3486e6a84b 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 70490bf2697b..2973cce74abd 100644 index 70490bf2697b1..2973cce74abdf 100644
--- a/drivers/firmware/efi/efi.c --- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
@ -1287,7 +1285,7 @@ index 70490bf2697b..2973cce74abd 100644
diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c
new file mode 100644 new file mode 100644
index 000000000000..de0a3714a5d4 index 0000000000000..de0a3714a5d44
--- /dev/null --- /dev/null
+++ b/drivers/firmware/efi/secureboot.c +++ b/drivers/firmware/efi/secureboot.c
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
@ -1330,7 +1328,7 @@ index 000000000000..de0a3714a5d4
+ } + }
+} +}
diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
index 15fc182d05ef..ca416dab156d 100644 index 15fc182d05ef0..ca416dab156d8 100644
--- a/drivers/gpu/drm/bridge/synopsys/Kconfig --- a/drivers/gpu/drm/bridge/synopsys/Kconfig
+++ b/drivers/gpu/drm/bridge/synopsys/Kconfig +++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
@@ -46,6 +46,14 @@ config DRM_DW_HDMI_CEC @@ -46,6 +46,14 @@ config DRM_DW_HDMI_CEC
@ -1349,7 +1347,7 @@ index 15fc182d05ef..ca416dab156d 100644
tristate tristate
select DRM_KMS_HELPER select DRM_KMS_HELPER
diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile
index ce715562e9e5..9869d9651ed1 100644 index ce715562e9e52..9869d9651ed1f 100644
--- a/drivers/gpu/drm/bridge/synopsys/Makefile --- a/drivers/gpu/drm/bridge/synopsys/Makefile
+++ b/drivers/gpu/drm/bridge/synopsys/Makefile +++ b/drivers/gpu/drm/bridge/synopsys/Makefile
@@ -5,4 +5,6 @@ obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o @@ -5,4 +5,6 @@ obj-$(CONFIG_DRM_DW_HDMI_GP_AUDIO) += dw-hdmi-gp-audio.o
@ -1361,7 +1359,7 @@ index ce715562e9e5..9869d9651ed1 100644
obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o obj-$(CONFIG_DRM_DW_MIPI_DSI) += dw-mipi-dsi.o
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
new file mode 100644 new file mode 100644
index 000000000000..181c5164b231 index 0000000000000..181c5164b2319
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
@@ -0,0 +1,647 @@ @@ -0,0 +1,647 @@
@ -2014,7 +2012,7 @@ index 000000000000..181c5164b231
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
new file mode 100644 new file mode 100644
index 000000000000..2115b8ef0bd6 index 0000000000000..2115b8ef0bd68
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
@@ -0,0 +1,834 @@ @@ -0,0 +1,834 @@
@ -2853,7 +2851,7 @@ index 000000000000..2115b8ef0bd6
+ +
+#endif /* __DW_HDMI_QP_H__ */ +#endif /* __DW_HDMI_QP_H__ */
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 23c49e91f1cc..448fadd4ba15 100644 index 23c49e91f1ccf..448fadd4ba15d 100644
--- a/drivers/gpu/drm/rockchip/Kconfig --- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -8,6 +8,7 @@ config DRM_ROCKCHIP @@ -8,6 +8,7 @@ config DRM_ROCKCHIP
@ -2880,7 +2878,7 @@ index 23c49e91f1cc..448fadd4ba15 100644
bool "Rockchip specific extensions for Synopsys DW MIPI DSI" bool "Rockchip specific extensions for Synopsys DW MIPI DSI"
select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY_MIPI_DPHY
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index 3ff7b21c0414..3eab662a5a1d 100644 index 3ff7b21c04149..3eab662a5a1d6 100644
--- a/drivers/gpu/drm/rockchip/Makefile --- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile
@@ -11,6 +11,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o @@ -11,6 +11,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o
@ -2892,7 +2890,7 @@ index 3ff7b21c0414..3eab662a5a1d 100644
rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 240552eb517f..76297987f84b 100644 index 240552eb517f7..76297987f84b0 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -91,74 +91,70 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder) @@ -91,74 +91,70 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
@ -3088,7 +3086,7 @@ index 240552eb517f..76297987f84b 100644
static const struct dw_hdmi_plat_data rk3568_hdmi_drv_data = { static const struct dw_hdmi_plat_data rk3568_hdmi_drv_data = {
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
new file mode 100644 new file mode 100644
index 000000000000..9c796ee4c303 index 0000000000000..9c796ee4c303a
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
@@ -0,0 +1,424 @@ @@ -0,0 +1,424 @@
@ -3517,7 +3515,7 @@ index 000000000000..9c796ee4c303
+ }, + },
+}; +};
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 11e5d10de4d7..b81b0c4da4c6 100644 index 11e5d10de4d73..b81b0c4da4c6b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -358,11 +358,34 @@ static void rockchip_drm_match_remove(struct device *dev) @@ -358,11 +358,34 @@ static void rockchip_drm_match_remove(struct device *dev)
@ -3565,7 +3563,7 @@ index 11e5d10de4d7..b81b0c4da4c6 100644
CONFIG_ROCKCHIP_DW_MIPI_DSI); CONFIG_ROCKCHIP_DW_MIPI_DSI);
ADD_ROCKCHIP_SUB_DRIVER(inno_hdmi_driver, CONFIG_ROCKCHIP_INNO_HDMI); ADD_ROCKCHIP_SUB_DRIVER(inno_hdmi_driver, CONFIG_ROCKCHIP_INNO_HDMI);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index 8d566fcd80a2..24b4ce5ceaf1 100644 index 8d566fcd80a23..24b4ce5ceaf19 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -88,6 +88,7 @@ int rockchip_drm_encoder_set_crtc_endpoint_id(struct rockchip_encoder *rencoder, @@ -88,6 +88,7 @@ int rockchip_drm_encoder_set_crtc_endpoint_id(struct rockchip_encoder *rencoder,
@ -3577,7 +3575,7 @@ index 8d566fcd80a2..24b4ce5ceaf1 100644
extern struct platform_driver inno_hdmi_driver; extern struct platform_driver inno_hdmi_driver;
extern struct platform_driver rockchip_dp_driver; extern struct platform_driver rockchip_dp_driver;
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c 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 --- a/drivers/hid/hid-rmi.c
+++ b/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) @@ -321,21 +321,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
@ -3679,7 +3677,7 @@ index d4af17fdba46..154f0403cbf4 100644
data->xport.ops = &hid_rmi_ops; data->xport.ops = &hid_rmi_ops;
diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 66d44a404ad0..d4383c2d7d1a 100644 index 66d44a404ad0c..d4383c2d7d1a8 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -3730,7 +3728,7 @@ index 66d44a404ad0..d4383c2d7d1a 100644
platform_driver_unregister(&etm4_platform_driver); platform_driver_unregister(&etm4_platform_driver);
etm4_pm_clear(); etm4_pm_clear();
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c 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 --- a/drivers/input/rmi4/rmi_driver.c
+++ b/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, @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status,
@ -3922,7 +3920,7 @@ index 2168b6cd7167..5d7cda175a0c 100644
if (data->f01_container->dev.driver) { if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */ /* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 83c8e617a2c5..27f9b4517095 100644 index 83c8e617a2c58..27f9b45170954 100644
--- a/drivers/iommu/iommu.c --- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@ -3962,7 +3960,7 @@ index 83c8e617a2c5..27f9b4517095 100644
* iommu_setup_default_domain - Set the default_domain for the group * iommu_setup_default_domain - Set the default_domain for the group
* @group: Group to change * @group: Group to change
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c
index f95898f68d68..4ce0c05c5129 100644 index f95898f68d68a..4ce0c05c51291 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/core.c --- a/drivers/net/wireless/realtek/rtl8xxxu/core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c
@@ -8147,6 +8147,8 @@ static const struct usb_device_id dev_table[] = { @@ -8147,6 +8147,8 @@ static const struct usb_device_id dev_table[] = {
@ -4041,7 +4039,7 @@ index f95898f68d68..4ce0c05c5129 100644
.driver_info = (unsigned long)&rtl8192cu_fops}, .driver_info = (unsigned long)&rtl8192cu_fops},
{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x624d, 0xff, 0xff, 0xff), {USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x624d, 0xff, 0xff, 0xff),
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dccb60c1d9cc..c7ec62f076c3 100644 index 8103bc24a54ea..ea629c78fa7c8 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -4452,6 +4452,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -4452,6 +4452,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@ -4076,7 +4074,7 @@ index dccb60c1d9cc..c7ec62f076c3 100644
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it. * class code. Fix it.
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ca4bc0ac76ad..8855e71076f4 100644 index ca4bc0ac76adc..8855e71076f48 100644
--- a/drivers/scsi/sd.c --- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -121,6 +121,14 @@ static const char *sd_cache_types[] = { @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = {
@ -4104,7 +4102,7 @@ index ca4bc0ac76ad..8855e71076f4 100644
if (err) if (err)
goto err_out_driver; goto err_out_driver;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c 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 --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -5844,6 +5844,13 @@ static void hub_event(struct work_struct *work) @@ -5844,6 +5844,13 @@ static void hub_event(struct work_struct *work)
@ -4123,7 +4121,7 @@ index 4b93c0bd1d4b..b98906237306 100644
usb_lock_device(hdev); usb_lock_device(hdev);
diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h diff --git a/include/drm/bridge/dw_hdmi_qp.h b/include/drm/bridge/dw_hdmi_qp.h
new file mode 100644 new file mode 100644
index 000000000000..e9be6d507ad9 index 0000000000000..e9be6d507ad9c
--- /dev/null --- /dev/null
+++ b/include/drm/bridge/dw_hdmi_qp.h +++ b/include/drm/bridge/dw_hdmi_qp.h
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
@ -4160,7 +4158,7 @@ index 000000000000..e9be6d507ad9
+void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi); +void dw_hdmi_qp_resume(struct device *dev, struct dw_hdmi_qp *hdmi);
+#endif /* __DW_HDMI_QP__ */ +#endif /* __DW_HDMI_QP__ */
diff --git a/include/linux/efi.h b/include/linux/efi.h diff --git a/include/linux/efi.h b/include/linux/efi.h
index e28d88066033..860227e20797 100644 index e28d880660337..860227e207970 100644
--- a/include/linux/efi.h --- a/include/linux/efi.h
+++ b/include/linux/efi.h +++ b/include/linux/efi.h
@@ -45,6 +45,8 @@ struct screen_info; @@ -45,6 +45,8 @@ struct screen_info;
@ -4228,7 +4226,7 @@ index e28d88066033..860227e20797 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) 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 diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
index 9eca013aa5e1..6f25ce6867a2 100644 index 9eca013aa5e1f..6f25ce6867a24 100644
--- a/include/linux/lsm_hook_defs.h --- a/include/linux/lsm_hook_defs.h
+++ b/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h
@@ -438,6 +438,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) @@ -438,6 +438,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap)
@ -4241,7 +4239,7 @@ index 9eca013aa5e1..6f25ce6867a2 100644
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) 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 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 --- a/include/linux/rmi.h
+++ b/include/linux/rmi.h +++ b/include/linux/rmi.h
@@ -364,6 +364,7 @@ struct rmi_driver_data { @@ -364,6 +364,7 @@ struct rmi_driver_data {
@ -4253,7 +4251,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport); int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h diff --git a/include/linux/security.h b/include/linux/security.h
index 2ec8f3014757..7273b2b8b23b 100644 index 2ec8f3014757c..7273b2b8b23b1 100644
--- a/include/linux/security.h --- a/include/linux/security.h
+++ b/include/linux/security.h +++ b/include/linux/security.h
@@ -522,6 +522,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -522,6 +522,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@ -4276,7 +4274,7 @@ index 2ec8f3014757..7273b2b8b23b 100644
u32 *uctx_len, void *val, size_t val_len, u32 *uctx_len, void *val, size_t val_len,
u64 id, u64 flags) u64 id, u64 flags)
diff --git a/kernel/module/signing.c b/kernel/module/signing.c 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 --- a/kernel/module/signing.c
+++ b/kernel/module/signing.c +++ b/kernel/module/signing.c
@@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info) @@ -61,10 +61,17 @@ int mod_verify_sig(const void *mod, struct load_info *info)
@ -4298,43 +4296,8 @@ index a2ff4242e623..f0d2be1ee4f1 100644
} }
int module_sig_check(struct load_info *info, int flags) int module_sig_check(struct load_info *info, int flags)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 2849b273b131..ff85242720a0 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1516,7 +1516,6 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
struct sk_buff_head *list = &sk->sk_receive_queue;
int rmem, err = -ENOMEM;
spinlock_t *busy = NULL;
- bool becomes_readable;
int size, rcvbuf;
/* Immediately drop when the receive queue is full.
@@ -1557,19 +1556,12 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
*/
sock_skb_set_dropcount(sk, skb);
- becomes_readable = skb_queue_empty(list);
__skb_queue_tail(list, skb);
spin_unlock(&list->lock);
- if (!sock_flag(sk, SOCK_DEAD)) {
- if (becomes_readable ||
- sk->sk_data_ready != sock_def_readable ||
- READ_ONCE(sk->sk_peek_off) >= 0)
- INDIRECT_CALL_1(sk->sk_data_ready,
- sock_def_readable, sk);
- else
- sk_wake_async_rcu(sk, SOCK_WAKE_WAITD, POLL_IN);
- }
+ if (!sock_flag(sk, SOCK_DEAD))
+ INDIRECT_CALL_1(sk->sk_data_ready, sock_def_readable, sk);
+
busylock_release(busy);
return 0;
diff --git a/scripts/tags.sh b/scripts/tags.sh diff --git a/scripts/tags.sh b/scripts/tags.sh
index 191e0461d6d5..e6f418b3e948 100755 index 191e0461d6d5b..e6f418b3e948b 100755
--- a/scripts/tags.sh --- a/scripts/tags.sh
+++ b/scripts/tags.sh +++ b/scripts/tags.sh
@@ -16,6 +16,8 @@ fi @@ -16,6 +16,8 @@ fi
@ -4347,7 +4310,7 @@ index 191e0461d6d5..e6f418b3e948 100755
# ignore arbitrary directories # ignore arbitrary directories
if [ -n "${IGNORE_DIRS}" ]; then if [ -n "${IGNORE_DIRS}" ]; then
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c 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 --- a/security/integrity/platform_certs/load_uefi.c
+++ b/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, @@ -74,7 +74,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
@ -4371,7 +4334,7 @@ index d1fdd113450a..182e8090cfe8 100644
} }
diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig diff --git a/security/lockdown/Kconfig b/security/lockdown/Kconfig
index e84ddf484010..d0501353a4b9 100644 index e84ddf4840101..d0501353a4b95 100644
--- a/security/lockdown/Kconfig --- a/security/lockdown/Kconfig
+++ b/security/lockdown/Kconfig +++ b/security/lockdown/Kconfig
@@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY @@ -16,6 +16,19 @@ config SECURITY_LOCKDOWN_LSM_EARLY
@ -4395,7 +4358,7 @@ index e84ddf484010..d0501353a4b9 100644
prompt "Kernel default lockdown mode" prompt "Kernel default lockdown mode"
default LOCK_DOWN_KERNEL_FORCE_NONE default LOCK_DOWN_KERNEL_FORCE_NONE
diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
index f2bdbd55aa2b..ddf496f7fca5 100644 index f2bdbd55aa2bc..ddf496f7fca5a 100644
--- a/security/lockdown/lockdown.c --- a/security/lockdown/lockdown.c
+++ b/security/lockdown/lockdown.c +++ b/security/lockdown/lockdown.c
@@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what) @@ -74,6 +74,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what)
@ -4407,7 +4370,7 @@ index f2bdbd55aa2b..ddf496f7fca5 100644
static const struct lsm_id lockdown_lsmid = { static const struct lsm_id lockdown_lsmid = {
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index c5981e558bc2..431202cd09c1 100644 index c5981e558bc26..431202cd09c17 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -5769,6 +5769,18 @@ int security_locked_down(enum lockdown_reason what) @@ -5769,6 +5769,18 @@ int security_locked_down(enum lockdown_reason what)
@ -4430,10 +4393,10 @@ index c5981e558bc2..431202cd09c1 100644
* security_bdev_alloc() - Allocate a block device LSM blob * security_bdev_alloc() - Allocate a block device LSM blob
* @bdev: block device * @bdev: block device
diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c
index 9ac71a66840c..6fae234aaf36 100644 index 0735fcb827ed7..6fae234aaf36c 100644
--- a/tools/tracing/rtla/src/utils.c --- a/tools/tracing/rtla/src/utils.c
+++ b/tools/tracing/rtla/src/utils.c +++ b/tools/tracing/rtla/src/utils.c
@@ -211,29 +211,25 @@ long parse_ns_duration(char *val) @@ -211,24 +211,20 @@ long parse_ns_duration(char *val)
/* /*
* This is a set of helper functions to use SCHED_DEADLINE. * This is a set of helper functions to use SCHED_DEADLINE.
*/ */
@ -4472,38 +4435,3 @@ index 9ac71a66840c..6fae234aaf36 100644
#endif #endif
#define SCHED_DEADLINE 6 #define SCHED_DEADLINE 6
-static inline int sched_setattr(pid_t pid, const struct sched_attr *attr,
+static inline int syscall_sched_setattr(pid_t pid, const struct sched_attr *attr,
unsigned int flags) {
return syscall(__NR_sched_setattr, pid, attr, flags);
}
@@ -243,7 +239,7 @@ int __set_sched_attr(int pid, struct sched_attr *attr)
int flags = 0;
int retval;
- retval = sched_setattr(pid, attr, flags);
+ retval = syscall_sched_setattr(pid, attr, flags);
if (retval < 0) {
err_msg("Failed to set sched attributes to the pid %d: %s\n",
pid, strerror(errno));
diff --git a/tools/tracing/rtla/src/utils.h b/tools/tracing/rtla/src/utils.h
index d44513e6c66a..99c9cf81bcd0 100644
--- a/tools/tracing/rtla/src/utils.h
+++ b/tools/tracing/rtla/src/utils.h
@@ -46,6 +46,7 @@ update_sum(unsigned long long *a, unsigned long long *b)
*a += *b;
}
+#ifndef SCHED_ATTR_SIZE_VER0
struct sched_attr {
uint32_t size;
uint32_t sched_policy;
@@ -56,6 +57,7 @@ struct sched_attr {
uint64_t sched_deadline;
uint64_t sched_period;
};
+#endif /* SCHED_ATTR_SIZE_VER0 */
int parse_prio(char *arg, struct sched_attr *sched_param);
int parse_cpu_set(char *cpu_list, cpu_set_t *set);

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.12.4.tar.xz) = 8600c41c5487623669dcc294a994a438ff648ee226818aabf8168c7b1314279848cfe68a95828af7b60db18be8c96b64486f80e3c7ece52ba5202d238850e9df SHA512 (linux-6.12.5.tar.xz) = 59ebf64e0c81cef37b2125cace3df7600bc9af95dd9186b415b72fb8c9fea8eee90cdc862a548e830cf3c0cbe823ddf83b6153952e01404b4c8ddb9fb576f0b1
SHA512 (kernel-abi-stablelists-6.12.4.tar.xz) = 6909f5064bc5c646ea660a1173ad62fd5097a6f2154fdbb0a16c18d231b8a5c5a661b7029137960e98fd6be28b29ee894be7f843531a4877a55e2422766ef2b9 SHA512 (kernel-abi-stablelists-6.12.5.tar.xz) = 17f81f5bec4dd21292ff1e72b8ddb1b2cb9e568a4098b0db4fa6a3ad049a097a5964436d77d823fd5c92b95ff62bdcf60a1458c52c7ad8a1095bd64a0c850cf2
SHA512 (kernel-kabi-dw-6.12.4.tar.xz) = fa07fe34ad0c3c0e957049b1186ca9246b64e49b618a923a469f5e295d2cf10e4b7497a9b684695269e5c6770634d999ece1a5752c48b2161cc49af9bf548bcf SHA512 (kernel-kabi-dw-6.12.5.tar.xz) = d7b4fc35a191dc229d85cd28b2597b850126a396c5b4e45dbbfe770d8d0e2cdedd30e07e82ccae4bd7a60f28d140cef4928258cf0cf87b71a290b03741bf4ceb