kernel-6.0.0-300

* Wed Oct 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.0-0] - enable efifb for Nvidia (Justin M. Forbes) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) - Updates for stable Fedora (Justin M. Forbes) - Forgot too remove this from pending, it is set properly in ark (Justin M. Forbes) - redhat/Makefile: Add DIST to git tags for RHEL (Prarit Bhargava) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-10-05 15:51:23 -05:00 · 2022-10-05 15:51:23 -05:00 · 479417d6e6
commit 479417d6e6
parent 44ff646f83
31 changed files with 8271 additions and 1690 deletions
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,99 +1,96 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a6e2920b9cffa449fbe11bb55c6f3c60f9d81bcd
- a6e2920b9cffa449fbe11bb55c6f3c60f9d81bcd drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0988b1d9ca90040134efda1f36af93a0b90d42b2
+ 0988b1d9ca90040134efda1f36af93a0b90d42b2 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d562520a841e6d8cbb5dc484918752872243c5be
- d562520a841e6d8cbb5dc484918752872243c5be efi: x86: Set the NX-compatibility flag in the PE header
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/5560f4156f7be5fdca5f6656f2fd87def5bdd232
+ 5560f4156f7be5fdca5f6656f2fd87def5bdd232 drm: Prevent drm_copy_field() to attempt copying a NULL pointer

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/309d5f6a4bdb06369452f38382abece984776edb
- 309d5f6a4bdb06369452f38382abece984776edb efi: libstub: ensure allocated memory to be executable
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/53f7bba19d94e30884d8c5e59b1d6b935a565aaa
+ 53f7bba19d94e30884d8c5e59b1d6b935a565aaa drm: Use size_t type for len variable in drm_copy_field()

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/640e4133f6dcdb68758acf53bb95e98041a84dd1
- 640e4133f6dcdb68758acf53bb95e98041a84dd1 efi: libstub: declare DXE services table
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/366a22cbb7b2ee8b47ce2fe65368483b631fd0aa
+ 366a22cbb7b2ee8b47ce2fe65368483b631fd0aa arm64: use common CONFIG_MAX_ZONEORDER for arm kernel

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/d3295aba8d6144b97e54961df15f6f141c4c83f6
- d3295aba8d6144b97e54961df15f6f141c4c83f6 arm64: use common CONFIG_MAX_ZONEORDER for arm kernel
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/6b4e3c1ed136efa4bfabcb8e897a900e45dac638
+ 6b4e3c1ed136efa4bfabcb8e897a900e45dac638 RHEL: disable io_uring support

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6494660791bbf0b6c6b3953203fb2274d8a4d229
- 6494660791bbf0b6c6b3953203fb2274d8a4d229 RHEL: disable io_uring support
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8d2d517f1f0e48dc247be69f30248d421efde17f
+ 8d2d517f1f0e48dc247be69f30248d421efde17f nvme: nvme_mpath_init remove multipath check

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/3ced8cb58c461bb2295b02518b58ca58ac07594e
- 3ced8cb58c461bb2295b02518b58ca58ac07594e nvme: nvme_mpath_init remove multipath check
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/bf52d477bcb2c484912c7d4cfa214d7689b3aad3
+ bf52d477bcb2c484912c7d4cfa214d7689b3aad3 nvme: decouple basic ANA log page re-read support from native multipathing

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/11e95ab6eeba1f58009a592dfe88557832edc150
- 11e95ab6eeba1f58009a592dfe88557832edc150 nvme: decouple basic ANA log page re-read support from native multipathing
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f4067768924992c614f0b14928c8cc520c307c06
+ f4067768924992c614f0b14928c8cc520c307c06 nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a605391be25abc3aa67715ca2385e56ca2f221be
- a605391be25abc3aa67715ca2385e56ca2f221be nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/add86fbef39efce9101a9e295a29d6748e0c3048
+ add86fbef39efce9101a9e295a29d6748e0c3048 nvme: Return BLK_STS_TARGET if the DNR bit is set

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b7e0b9c5f7b555de55e21e22194614016f736050
- b7e0b9c5f7b555de55e21e22194614016f736050 nvme: Return BLK_STS_TARGET if the DNR bit is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/716cb6bb41d5f6ece4ef37a081257e321e14eaa9
+ 716cb6bb41d5f6ece4ef37a081257e321e14eaa9 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fb03af09a928d8453fe7b46c0006110778a63439
- fb03af09a928d8453fe7b46c0006110778a63439 REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/022a766cad880585e54174b793f87aa2808e4bb1
+ 022a766cad880585e54174b793f87aa2808e4bb1 KEYS: Make use of platform keyring for module signature verify

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/526ec6a420cb0f20d57bbfb8aa1075f44cf9ea66
- 526ec6a420cb0f20d57bbfb8aa1075f44cf9ea66 KEYS: Make use of platform keyring for module signature verify
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cdb9c8043125406948447409ab7adcf9010ad68a
+ cdb9c8043125406948447409ab7adcf9010ad68a Input: rmi4 - remove the need for artificial IRQ in case of HID

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/832d097bc46cf73a235cd6e07a69150ae4ec3098
- 832d097bc46cf73a235cd6e07a69150ae4ec3098 Input: rmi4 - remove the need for artificial IRQ in case of HID
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/77196f630f45012fa3f14c858f7b34ac6c6f86ef
+ 77196f630f45012fa3f14c858f7b34ac6c6f86ef ARM: tegra: usb no reset

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a68b4e6cb41aa6bd07423087a4ca60731814b456
- a68b4e6cb41aa6bd07423087a4ca60731814b456 ARM: tegra: usb no reset
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f473203a4359d861a261624dd559dfee410fc28b
+ f473203a4359d861a261624dd559dfee410fc28b arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/929732dfaebacfbdfc2ad94538ca05a8bea82026
- 929732dfaebacfbdfc2ad94538ca05a8bea82026 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/f4c2667b39234a6c07887137f0549b290c156dcc
+ f4c2667b39234a6c07887137f0549b290c156dcc Add option of 13 for FORCE_MAX_ZONEORDER

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/e248263213855de88dd96fa169e5274dbf68a60e
- e248263213855de88dd96fa169e5274dbf68a60e Add option of 13 for FORCE_MAX_ZONEORDER
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/555a6328e1bb3a80b31e83c1991d97a130522990
+ 555a6328e1bb3a80b31e83c1991d97a130522990 s390: Lock down the kernel when the IPL secure flag is set

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a7a8599f76a60a9065ddb75c239cdcc23375737d
- a7a8599f76a60a9065ddb75c239cdcc23375737d s390: Lock down the kernel when the IPL secure flag is set
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/67cdd2672afd82580d4073bbea1dc7029a0add7c
+ 67cdd2672afd82580d4073bbea1dc7029a0add7c efi: Lock down the kernel if booted in secure boot mode

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/af7a623e9d51ee4ee5543cc6479ccb42dbbaf536
- af7a623e9d51ee4ee5543cc6479ccb42dbbaf536 efi: Lock down the kernel if booted in secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/1f60ebfcde236d1d586266b941ae4987cd598538
+ 1f60ebfcde236d1d586266b941ae4987cd598538 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/16af9a5c9354ec24a96d6fab3c38b95699915cd9
- 16af9a5c9354ec24a96d6fab3c38b95699915cd9 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/b4e1f1bf727cbb5c1df1394cca0f4d9646a1c034
+ b4e1f1bf727cbb5c1df1394cca0f4d9646a1c034 security: lockdown: expose a hook to lock the kernel down

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/6b4bd6bbc0316c8a01b6ed2158d0b2b8fc411352
- 6b4bd6bbc0316c8a01b6ed2158d0b2b8fc411352 security: lockdown: expose a hook to lock the kernel down
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/790b3b1b2c984ed14ee6702adfb922e0464adff2
+ 790b3b1b2c984ed14ee6702adfb922e0464adff2 Make get_cert_list() use efi_status_to_str() to print error messages.

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/5eeb0023a3e28ad82b791ab58f88ad4797ded493
- 5eeb0023a3e28ad82b791ab58f88ad4797ded493 Make get_cert_list() use efi_status_to_str() to print error messages.
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/5b6b32d141a089a905502f181343384d254dd762
+ 5b6b32d141a089a905502f181343384d254dd762 Add efi_status_to_str() and rework efi_status_to_err().

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/dc4566d59a49da77c104dd87cc0a06c7afd675a6
- dc4566d59a49da77c104dd87cc0a06c7afd675a6 Add efi_status_to_str() and rework efi_status_to_err().
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea728cd0586af923af7a294b519bc6b6969e5c3d
+ ea728cd0586af923af7a294b519bc6b6969e5c3d arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/8bfe8f9647f56acb98fa9303f7ac5e4f697afc25
- 8bfe8f9647f56acb98fa9303f7ac5e4f697afc25 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/abb0d4f70c8ee891312ae950bcd0058b44d8c8fb
+ abb0d4f70c8ee891312ae950bcd0058b44d8c8fb iommu/arm-smmu: workaround DMA mode issues

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/43460ffdfc191c9a6ab7942c30308288f9c896b4
- 43460ffdfc191c9a6ab7942c30308288f9c896b4 iommu/arm-smmu: workaround DMA mode issues
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4da56825d1de4442e897946153afd5484fd01e28
+ 4da56825d1de4442e897946153afd5484fd01e28 ipmi: do not configure ipmi for HPE m400

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b4cd9d01c8b570b88508e07be3235bffa4431366
- b4cd9d01c8b570b88508e07be3235bffa4431366 ipmi: do not configure ipmi for HPE m400
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ce14a198049d6084912a72d8932e4749c9c7ca3e
+ ce14a198049d6084912a72d8932e4749c9c7ca3e ahci: thunderx2: Fix for errata that affects stop engine

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/265c8668cd033fea94aba669106f923dda13d5b5
- 265c8668cd033fea94aba669106f923dda13d5b5 ahci: thunderx2: Fix for errata that affects stop engine
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/46ca13858db525ec325cf0768d87bb8c53b04b5c
+ 46ca13858db525ec325cf0768d87bb8c53b04b5c Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/9b7befb46327e9033fc70a962f7d5b91695ca8df
- 9b7befb46327e9033fc70a962f7d5b91695ca8df Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8c82ea933bc279764f96a1f17e59e2d313b31b18
+ 8c82ea933bc279764f96a1f17e59e2d313b31b18 tags.sh: Ignore redhat/rpm

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/fff75b72d44ea794af69ca21e5d0a41f52b73c79
- fff75b72d44ea794af69ca21e5d0a41f52b73c79 tags.sh: Ignore redhat/rpm
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e8d8c4062ed7e1b7e229e9dbe28b350e9a84a114
+ e8d8c4062ed7e1b7e229e9dbe28b350e9a84a114 aarch64: acpi scan: Fix regression related to X-Gene UARTs

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b82818f39a36c34859640079b2ecb509441118e5
- b82818f39a36c34859640079b2ecb509441118e5 aarch64: acpi scan: Fix regression related to X-Gene UARTs
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/2a529f96af451225321df486009fa0ec0df6dcb2
+ 2a529f96af451225321df486009fa0ec0df6dcb2 ACPI / irq: Workaround firmware issue on X-Gene based m400

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/a9578bb330177dae14dd59e737ecd6921de01812
- a9578bb330177dae14dd59e737ecd6921de01812 ACPI / irq: Workaround firmware issue on X-Gene based m400
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/ed09294716c4d399c3c267cdc66a518d567e57f4
+ ed09294716c4d399c3c267cdc66a518d567e57f4 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/b4896d1d46813ebf55d79f744544440c9334920e
- b4896d1d46813ebf55d79f744544440c9334920e ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/a4eee5deb356c386a5ed97e3dcafa3d97b6ae60b
+ a4eee5deb356c386a5ed97e3dcafa3d97b6ae60b Pull the RHEL version defines out of the Makefile

-"https://gitlab.com/cki-project/kernel-ark/-/commit"/48a648d1794cac8e885afccb97d27d2b82891a9b
- 48a648d1794cac8e885afccb97d27d2b82891a9b Pull the RHEL version defines out of the Makefile
-
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/0d50756cbca2feb1911861c046621161d4d8269a
- 0d50756cbca2feb1911861c046621161d4d8269a [initial commit] Add Red Hat variables in the top level makefile
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/896e1ca026dac7e2e8a1a3a93a97aee8c9d119d5
+ 896e1ca026dac7e2e8a1a3a93a97aee8c9d119d5 [initial commit] Add Red Hat variables in the top level makefile

--- a/filter-modules.sh.fedora
+++ b/filter-modules.sh.fedora
@ -25,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 ppp slip usb wireless"

 ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell mellanox neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"

+cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
+
 iiodrvs="accel light pressure proximity"

 iiocommondrvs="cros_ec_sensors"
@ -106,6 +108,12 @@ do
 	filter_dir $1 drivers/net/ethernet/${eth}
 done

+# Filter the crypto drivers
+for crypt in ${cryptdrvs}
+do
+	filter_dir $1 drivers/crypto/${crypt}
+done
+
 # SCSI
 for scsi in ${scsidrvs}
 do
--- a/filter-modules.sh.rhel
+++ b/filter-modules.sh.rhel
@ -25,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless"

 ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom"

+cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat"
+
 inputdrvs="gameport tablet touchscreen"

 scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic hisi_sas isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
@ -100,6 +102,12 @@ do
 	filter_dir $1 drivers/net/ethernet/${eth}
 done

+# Filter the crypto drivers
+for crypt in ${cryptdrvs}
+do
+	filter_dir $1 drivers/crypto/${crypt}
+done
+
 # SCSI
 for scsi in ${scsidrvs}
 do
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
--- a/kernel.spec
+++ b/kernel.spec
--- a/mod-internal.list
+++ b/mod-internal.list
@ -1,59 +1,60 @@
+bitfield_kunit
+clk-gate_test
+clk_test
+cmdline_kunit
+cpumask_kunit
+cros_kunit
+dev_addr_lists_test
 dmatest
+ext4-inode-test
+fat_test
+iio-test-format
+iio-test-rescale
+kfence_test
 kunit
 kunit-test
-ext4-inode-test
-list-test
-sysctl-test
-mptcp_crypto_test
-mptcp_token_test
-bitfield_kunit
-cmdline_kunit
-property-entry-test
-qos-test
-resource_kunit
-soc-topology-test
-string-stream-test
-test_linear_ranges
-test_bits
-test_kasan
-time_test
-fat_test
 lib_test
-rational-test
-test_list_sort
-slub_kunit
-memcpy_kunit
-dev_addr_lists_test
-kfence_test
-test_hash
+list-test
 locktorture
 mac80211_hwsim
+memcpy_kunit
+mptcp_crypto_test
+mptcp_token_test
+mtty
 netdevsim
+overflow_kunit
 pktgen
+rational-test
+rcuscale
 rcutorture
+refscale
+resource_kunit
 rocker
 scftorture
+slub_kunit
+soc-topology-test
+soc-utils-test
+stackinit_kunit
+sysctl-test
+test_bits
+test_bpf
+test_hash
+test_hmm
+test_kasan
 test_klp_atomic_replace
+test_klp_callbacks_busy
 test_klp_callbacks_demo
 test_klp_callbacks_demo2
-test_klp_callbacks_busy
 test_klp_callbacks_mod
 test_klp_livepatch
 test_klp_shadow_vars
 test_klp_state
 test_klp_state2
 test_klp_state3
-torture
-refscale
-rcuscale
-memcpy_kunit
-dev_addr_lists_test
-test_hash
-test_bpf
-stackinit_kunit
-overflow_kunit
-clk-gate_test
-clk_test
-mtty
-test_hmm
+test_kprobes
+test_linear_ranges
+test_list_sort
+test_sort
 test_vmalloc
+time_test
+torture
--- a/mod-partner.list
+++ b/mod-partner.list
@ -0,0 +1,2 @@
+afs
+rxrpc
--- a/patch-5.18-redhat.patch
+++ b/patch-5.18-redhat.patch
@ -4,8 +4,6 @@
 arch/s390/include/asm/ipl.h                        |   1 +
 arch/s390/kernel/ipl.c                             |   5 +
 arch/s390/kernel/setup.c                           |   4 +
- arch/x86/boot/header.S                             |   4 +
- arch/x86/include/asm/efi.h                         |   5 +
 arch/x86/kernel/setup.c                            |  22 ++--
 drivers/acpi/apei/hest.c                           |   8 ++
 drivers/acpi/irq.c                                 |  17 ++-
@ -13,13 +11,11 @@
 drivers/ata/libahci.c                              |  18 +++
 drivers/char/ipmi/ipmi_dmi.c                       |  15 +++
 drivers/char/ipmi/ipmi_msghandler.c                |  16 ++-
- drivers/firmware/efi/Kconfig                       |  12 ++
 drivers/firmware/efi/Makefile                      |   1 +
 drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
- drivers/firmware/efi/libstub/efistub.h             |  74 ++++++++++++
- drivers/firmware/efi/libstub/x86-stub.c            | 119 +++++++++++++++++++-
 drivers/firmware/efi/secureboot.c                  |  38 +++++++
 drivers/firmware/sysfb.c                           |  18 ++-
+ drivers/gpu/drm/drm_ioctl.c                        |   8 +-
 drivers/hid/hid-rmi.c                              |  64 -----------
 drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
 drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
@ -29,22 +25,22 @@
 drivers/nvme/host/nvme.h                           |   4 +
 drivers/pci/quirks.c                               |  24 ++++
 drivers/usb/core/hub.c                             |   7 ++
- include/linux/efi.h                                |  24 ++--
+ include/linux/efi.h                                |  22 ++--
 include/linux/lsm_hook_defs.h                      |   2 +
 include/linux/lsm_hooks.h                          |   6 +
 include/linux/rmi.h                                |   1 +
 include/linux/security.h                           |   5 +
 init/Kconfig                                       |   2 +-
- kernel/module_signing.c                            |   9 +-
+ kernel/module/signing.c                            |   9 +-
 scripts/tags.sh                                    |   2 +
 security/integrity/platform_certs/load_uefi.c      |   6 +-
 security/lockdown/Kconfig                          |  13 +++
 security/lockdown/lockdown.c                       |   1 +
 security/security.c                                |   6 +
- 43 files changed, 712 insertions(+), 191 deletions(-)
+ 39 files changed, 508 insertions(+), 187 deletions(-)

 diff --git a/Makefile b/Makefile
-index eb3adfec0b22..a9fcb4a575ea 100644
+index 8478e13e9424..9179a4f53267 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -59,10 +55,10 @@ index eb3adfec0b22..a9fcb4a575ea 100644
 # to get the ordering right.
 #
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 2e8091e2d8a8..32e0403314b1 100644
+index 87badeae3181..2ec7919034d8 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1486,9 +1486,9 @@ config HIGHMEM
+@@ -1387,9 +1387,9 @@ config HIGHMEM
 	  If unsure, say n.

 config HIGHPTE
@ -75,10 +71,10 @@ index 2e8091e2d8a8..32e0403314b1 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 20ea89d9ac2f..774c1a05152d 100644
+index 1ce7685ad5de..101f1d767658 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1126,7 +1126,7 @@ endchoice
+@@ -1182,7 +1182,7 @@ endchoice

 config ARM64_FORCE_52BIT
 	bool "Force 52-bit virtual addresses for userspace"
@ -87,7 +83,7 @@ index 20ea89d9ac2f..774c1a05152d 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
-@@ -1365,6 +1365,7 @@ config XEN
+@@ -1421,6 +1421,7 @@ config XEN
 config FORCE_MAX_ZONEORDER
 	int
 	default "14" if ARM64_64K_PAGES
@ -96,7 +92,7 @@ index 20ea89d9ac2f..774c1a05152d 100644
 	default "11"
 	help
 diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
-index 3f8ee257f9aa..3ab92feb6241 100644
+index a405b6bb89fb..50827b341fd7 100644
 --- a/arch/s390/include/asm/ipl.h
 +++ b/arch/s390/include/asm/ipl.h
@@ -128,6 +128,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,
@ -121,7 +117,7 @@ index 1cc85b8ff42e..b7ee128c67ce 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index d860ac300919..6e63924932e6 100644
+index bbd4bde4f65d..dd60114ae9c1 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@ -132,7 +128,7 @@ index d860ac300919..6e63924932e6 100644
 #include <linux/hugetlb.h>
 #include <linux/kmemleak.h>

-@@ -965,6 +966,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -968,6 +969,9 @@ void __init setup_arch(char **cmdline_p)

 	log_component_list();

@ -142,43 +138,11 @@ index d860ac300919..6e63924932e6 100644
 	/* Have one command line that is parsed and saved in /proc/cmdline */
 	/* boot_command_line has been already set up in early.c */
 	*cmdline_p = boot_command_line;
-diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 6dbd7e9f74c9..0352e4589efa 100644
--- a/arch/x86/boot/header.S
-+++ b/arch/x86/boot/header.S
-@@ -163,7 +163,11 @@ extra_header_fields:
- 	.long	0x200				# SizeOfHeaders
- 	.long	0				# CheckSum
- 	.word	IMAGE_SUBSYSTEM_EFI_APPLICATION	# Subsystem (EFI application)
-+#ifdef CONFIG_DXE_MEM_ATTRIBUTES
-+	.word	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	# DllCharacteristics
-+#else
- 	.word	0				# DllCharacteristics
-+#endif
- #ifdef CONFIG_X86_32
- 	.long	0				# SizeOfStackReserve
- 	.long	0				# SizeOfStackCommit
-diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
-index 98938a68251c..bed74a0f2932 100644
--- a/arch/x86/include/asm/efi.h
-+++ b/arch/x86/include/asm/efi.h
-@@ -357,6 +357,11 @@ static inline u32 efi64_convert_status(efi_status_t status)
- 						   runtime),		\
- 				    func, __VA_ARGS__))
-
-+#define efi_dxe_call(func, ...)						\
-+	(efi_is_native()						\
-+		? efi_dxe_table->func(__VA_ARGS__)			\
-+		: __efi64_thunk_map(efi_dxe_table, func, __VA_ARGS__))
-+
- #else /* CONFIG_EFI_MIXED */
-
- static inline bool efi_is_64bit(void)
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index c95b9ac5a457..6640be279dae 100644
+index 216fee7144ee..55e817aa000d 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
 #include <linux/root_dev.h>
 #include <linux/hugetlb.h>
 #include <linux/tboot.h>
@ -186,7 +150,7 @@ index c95b9ac5a457..6640be279dae 100644
 #include <linux/usb/xhci-dbgp.h>
 #include <linux/static_call.h>
 #include <linux/swiotlb.h>
-@@ -946,6 +947,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -1036,6 +1037,13 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled(EFI_BOOT))
 		efi_init();

@ -200,7 +164,7 @@ index c95b9ac5a457..6640be279dae 100644
 	dmi_setup();

 	/*
-@@ -1115,19 +1123,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1205,19 +1213,7 @@ void __init setup_arch(char **cmdline_p)
 	/* Allocate bigger log buffer */
 	setup_log_buf(1);

@ -241,10 +205,10 @@ index 6aef1ee5e1bd..8f146b1b4972 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 c68e694fca26..146cba5ae5bc 100644
+index dabe45eba055..82cf1ddf25d6 100644
 --- a/drivers/acpi/irq.c
 +++ b/drivers/acpi/irq.c
-@@ -130,6 +130,7 @@ struct acpi_irq_parse_one_ctx {
+@@ -137,6 +137,7 @@ struct acpi_irq_parse_one_ctx {
 	unsigned int index;
 	unsigned long *res_flags;
 	struct irq_fwspec *fwspec;
@ -252,7 +216,7 @@ index c68e694fca26..146cba5ae5bc 100644
 };

 /**
-@@ -201,7 +202,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -208,7 +209,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
 		return AE_CTRL_TERMINATE;
 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
 		eirq = &ares->data.extended_irq;
@ -262,7 +226,7 @@ index c68e694fca26..146cba5ae5bc 100644
 			return AE_OK;
 		if (ctx->index >= eirq->interrupt_count) {
 			ctx->index -= eirq->interrupt_count;
-@@ -236,8 +238,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -244,8 +246,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
 static int acpi_irq_parse_one(acpi_handle handle, unsigned int index,
 			      struct irq_fwspec *fwspec, unsigned long *flags)
 {
@ -284,10 +248,10 @@ index c68e694fca26..146cba5ae5bc 100644
 	return ctx.rc;
 }
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 762b61f67e6c..3581d4898dc4 100644
+index 42cec8120f18..c6dc77dba6b6 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1766,6 +1766,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1752,6 +1752,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
 	if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
 		return false;

@ -359,7 +323,7 @@ index bbf7029e224b..cf7faa970dd6 100644
 		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);

 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 2610e809c802..4f04a6bcf2e9 100644
+index 703433493c85..6b1b102b9b7d 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -35,6 +35,7 @@
@ -370,7 +334,7 @@ index 2610e809c802..4f04a6bcf2e9 100644
 #include <linux/delay.h>

 #define IPMI_DRIVER_VERSION "39.2"
-@@ -5427,8 +5428,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5516,8 +5517,21 @@ static int __init ipmi_init_msghandler_mod(void)
 {
 	int rv;

@ -393,34 +357,11 @@ index 2610e809c802..4f04a6bcf2e9 100644
 	mutex_lock(&ipmi_interfaces_mutex);
 	rv = ipmi_register_driver();
 	mutex_unlock(&ipmi_interfaces_mutex);
-diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
-index 243882f5e5f9..4a0fa81a563d 100644
--- a/drivers/firmware/efi/Kconfig
-+++ b/drivers/firmware/efi/Kconfig
-@@ -91,6 +91,18 @@ config EFI_SOFT_RESERVE
-
- 	  If unsure, say Y.
-
-+config EFI_DXE_MEM_ATTRIBUTES
-+	bool "Adjust memory attributes in EFISTUB"
-+	depends on EFI && EFI_STUB && X86
-+	default y
-+	help
-+	  UEFI specification does not guarantee all memory to be
-+	  accessible for both write and execute as the kernel expects
-+	  it to be.
-+	  Use DXE services to check and alter memory protection
-+	  attributes during boot via EFISTUB to ensure that memory
-+	  ranges used by the kernel are writable and executable.
-+
- config EFI_PARAMS_FROM_FDT
- 	bool
- 	help
 diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index c02ff25dd477..d860f8eb9a81 100644
+index 8d151e332584..bd29fe4ddbf3 100644
 --- a/drivers/firmware/efi/Makefile
 +++ b/drivers/firmware/efi/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP)		+= fake_map.o
+@@ -27,6 +27,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP)		+= fake_map.o
 obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)	+= efibc.o
 obj-$(CONFIG_EFI_TEST)			+= test/
 obj-$(CONFIG_EFI_DEV_PATH_PARSER)	+= dev-path-parser.o
@ -429,7 +370,7 @@ index c02ff25dd477..d860f8eb9a81 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 ff57db8f8d05..d7dfde3260bf 100644
+index e4080ad96089..e050d2f8dbe5 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
@@ -31,6 +31,7 @@
@ -440,7 +381,7 @@ index ff57db8f8d05..d7dfde3260bf 100644

 #include <asm/early_ioremap.h>

-@@ -851,40 +852,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -864,40 +865,101 @@ int efi_mem_type(unsigned long phys_addr)
 }
 #endif

@ -571,278 +512,8 @@ index ff57db8f8d05..d7dfde3260bf 100644
 +		return "Unknown error code";
 +	return found->description;
 }
+ EXPORT_SYMBOL_GPL(efi_status_to_err);

- static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
-diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
-index edb77b0621ea..2dc24776899a 100644
--- a/drivers/firmware/efi/libstub/efistub.h
-+++ b/drivers/firmware/efi/libstub/efistub.h
-@@ -36,6 +36,9 @@ extern bool efi_novamap;
-
- extern const efi_system_table_t *efi_system_table;
-
-+typedef union efi_dxe_services_table efi_dxe_services_table_t;
-+extern const efi_dxe_services_table_t *efi_dxe_table;
-+
- efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
- 				   efi_system_table_t *sys_table_arg);
-
-@@ -44,6 +47,7 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
- #define efi_is_native()		(true)
- #define efi_bs_call(func, ...)	efi_system_table->boottime->func(__VA_ARGS__)
- #define efi_rt_call(func, ...)	efi_system_table->runtime->func(__VA_ARGS__)
-+#define efi_dxe_call(func, ...)	efi_dxe_table->func(__VA_ARGS__)
- #define efi_table_attr(inst, attr)	(inst->attr)
- #define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)
-
-@@ -329,6 +333,76 @@ union efi_boot_services {
- 	} mixed_mode;
- };
-
-+typedef enum {
-+	EfiGcdMemoryTypeNonExistent,
-+	EfiGcdMemoryTypeReserved,
-+	EfiGcdMemoryTypeSystemMemory,
-+	EfiGcdMemoryTypeMemoryMappedIo,
-+	EfiGcdMemoryTypePersistent,
-+	EfiGcdMemoryTypeMoreReliable,
-+	EfiGcdMemoryTypeMaximum
-+} efi_gcd_memory_type_t;
-+
-+typedef struct {
-+	efi_physical_addr_t base_address;
-+	u64 length;
-+	u64 capabilities;
-+	u64 attributes;
-+	efi_gcd_memory_type_t gcd_memory_type;
-+	void *image_handle;
-+	void *device_handle;
-+} efi_gcd_memory_space_desc_t;
-+
-+/*
-+ * EFI DXE Services table
-+ */
-+union efi_dxe_services_table {
-+	struct {
-+		efi_table_hdr_t hdr;
-+		void *add_memory_space;
-+		void *allocate_memory_space;
-+		void *free_memory_space;
-+		void *remove_memory_space;
-+		efi_status_t (__efiapi *get_memory_space_descriptor)(efi_physical_addr_t,
-+								     efi_gcd_memory_space_desc_t *);
-+		efi_status_t (__efiapi *set_memory_space_attributes)(efi_physical_addr_t,
-+								     u64, u64);
-+		void *get_memory_space_map;
-+		void *add_io_space;
-+		void *allocate_io_space;
-+		void *free_io_space;
-+		void *remove_io_space;
-+		void *get_io_space_descriptor;
-+		void *get_io_space_map;
-+		void *dispatch;
-+		void *schedule;
-+		void *trust;
-+		void *process_firmware_volume;
-+		void *set_memory_space_capabilities;
-+	};
-+	struct {
-+		efi_table_hdr_t hdr;
-+		u32 add_memory_space;
-+		u32 allocate_memory_space;
-+		u32 free_memory_space;
-+		u32 remove_memory_space;
-+		u32 get_memory_space_descriptor;
-+		u32 set_memory_space_attributes;
-+		u32 get_memory_space_map;
-+		u32 add_io_space;
-+		u32 allocate_io_space;
-+		u32 free_io_space;
-+		u32 remove_io_space;
-+		u32 get_io_space_descriptor;
-+		u32 get_io_space_map;
-+		u32 dispatch;
-+		u32 schedule;
-+		u32 trust;
-+		u32 process_firmware_volume;
-+		u32 set_memory_space_capabilities;
-+	} mixed_mode;
-+};
-+
- typedef union efi_uga_draw_protocol efi_uga_draw_protocol_t;
-
- union efi_uga_draw_protocol {
-diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
-index 01ddd4502e28..b14e88ccefca 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
-+++ b/drivers/firmware/efi/libstub/x86-stub.c
-@@ -22,6 +22,7 @@
- #define MAXMEM_X86_64_4LEVEL (1ull << 46)
-
- const efi_system_table_t *efi_system_table;
-+const efi_dxe_services_table_t *efi_dxe_table;
- extern u32 image_offset;
- static efi_loaded_image_t *image = NULL;
-
-@@ -211,9 +212,110 @@ static void retrieve_apple_device_properties(struct boot_params *boot_params)
- 	}
- }
-
-+static void
-+adjust_memory_range_protection(unsigned long start, unsigned long size)
-+{
-+	efi_status_t status;
-+	efi_gcd_memory_space_desc_t desc;
-+	unsigned long end, next;
-+	unsigned long rounded_start, rounded_end;
-+	unsigned long unprotect_start, unprotect_size;
-+	int has_system_memory = 0;
-+
-+	if (efi_dxe_table == NULL)
-+		return;
-+
-+	rounded_start = rounddown(start, EFI_PAGE_SIZE);
-+	rounded_end = roundup(start + size, EFI_PAGE_SIZE);
-+
-+	/*
-+	 * Don't modify memory region attributes, they are
-+	 * already suitable, to lower the possibility to
-+	 * encounter firmware bugs.
-+	 */
-+
-+	for (end = start + size; start < end; start = next) {
-+
-+		status = efi_dxe_call(get_memory_space_descriptor, start, &desc);
-+
-+		if (status != EFI_SUCCESS)
-+			return;
-+
-+		next = desc.base_address + desc.length;
-+
-+		/*
-+		 * Only system memory is suitable for trampoline/kernel image placement,
-+		 * so only this type of memory needs its attributes to be modified.
-+		 */
-+
-+		if (desc.gcd_memory_type != EfiGcdMemoryTypeSystemMemory ||
-+		    (desc.attributes & (EFI_MEMORY_RO | EFI_MEMORY_XP)) == 0)
-+			continue;
-+
-+		unprotect_start = max(rounded_start, (unsigned long)desc.base_address);
-+		unprotect_size = min(rounded_end, next) - unprotect_start;
-+
-+		status = efi_dxe_call(set_memory_space_attributes,
-+				      unprotect_start, unprotect_size,
-+				      EFI_MEMORY_WB);
-+
-+		if (status != EFI_SUCCESS) {
-+			efi_warn("Unable to unprotect memory range [%08lx,%08lx]: %d\n",
-+				 unprotect_start,
-+				 unprotect_start + unprotect_size,
-+				 (int)status);
-+		}
-+	}
-+}
-+
-+/*
-+ * Trampoline takes 2 pages and can be loaded in first megabyte of memory
-+ * with its end placed between 128k and 640k where BIOS might start.
-+ * (see arch/x86/boot/compressed/pgtable_64.c)
-+ *
-+ * We cannot find exact trampoline placement since memory map
-+ * can be modified by UEFI, and it can alter the computed address.
-+ */
-+
-+#define TRAMPOLINE_PLACEMENT_BASE ((128 - 8)*1024)
-+#define TRAMPOLINE_PLACEMENT_SIZE (640*1024 - (128 - 8)*1024)
-+
-+void startup_32(struct boot_params *boot_params);
-+
-+static void
-+setup_memory_protection(unsigned long image_base, unsigned long image_size)
-+{
-+	/*
-+	 * Allow execution of possible trampoline used
-+	 * for switching between 4- and 5-level page tables
-+	 * and relocated kernel image.
-+	 */
-+
-+	adjust_memory_range_protection(TRAMPOLINE_PLACEMENT_BASE,
-+				       TRAMPOLINE_PLACEMENT_SIZE);
-+
-+#ifdef CONFIG_64BIT
-+	if (image_base != (unsigned long)startup_32)
-+		adjust_memory_range_protection(image_base, image_size);
-+#else
-+	/*
-+	 * Clear protection flags on a whole range of possible
-+	 * addresses used for KASLR. We don't need to do that
-+	 * on x86_64, since KASLR/extraction is performed after
-+	 * dedicated identity page tables are built and we only
-+	 * need to remove possible protection on relocated image
-+	 * itself disregarding further relocations.
-+	 */
-+	adjust_memory_range_protection(LOAD_PHYSICAL_ADDR,
-+				       KERNEL_IMAGE_SIZE - LOAD_PHYSICAL_ADDR);
-+#endif
-+}
-+
- static const efi_char16_t apple[] = L"Apple";
-
-static void setup_quirks(struct boot_params *boot_params)
-+static void setup_quirks(struct boot_params *boot_params,
-+			 unsigned long image_base,
-+			 unsigned long image_size)
- {
- 	efi_char16_t *fw_vendor = (efi_char16_t *)(unsigned long)
- 		efi_table_attr(efi_system_table, fw_vendor);
-@@ -222,6 +324,9 @@ static void setup_quirks(struct boot_params *boot_params)
- 		if (IS_ENABLED(CONFIG_APPLE_PROPERTIES))
- 			retrieve_apple_device_properties(boot_params);
- 	}
-+
-+	if (IS_ENABLED(CONFIG_EFI_DXE_MEM_ATTRIBUTES))
-+		setup_memory_protection(image_base, image_size);
- }
-
- /*
-@@ -341,8 +446,6 @@ static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
- 		asm("hlt");
- }
-
-void startup_32(struct boot_params *boot_params);
-
- void __noreturn efi_stub_entry(efi_handle_t handle,
- 			       efi_system_table_t *sys_table_arg,
- 			       struct boot_params *boot_params);
-@@ -677,11 +780,17 @@ unsigned long efi_main(efi_handle_t handle,
- 	efi_status_t status;
-
- 	efi_system_table = sys_table_arg;
-
- 	/* Check if we were booted by the EFI firmware */
- 	if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
- 		efi_exit(handle, EFI_INVALID_PARAMETER);
-
-+	efi_dxe_table = get_efi_config_table(EFI_DXE_SERVICES_TABLE_GUID);
-+	if (efi_dxe_table &&
-+	    efi_dxe_table->hdr.signature != EFI_DXE_SERVICES_TABLE_SIGNATURE) {
-+		efi_warn("Ignoring DXE services table: invalid signature\n");
-+		efi_dxe_table = NULL;
-+	}
-+
- 	/*
- 	 * If the kernel isn't already loaded at a suitable address,
- 	 * relocate it.
-@@ -791,7 +900,7 @@ unsigned long efi_main(efi_handle_t handle,
-
- 	setup_efi_pci(boot_params);
-
-	setup_quirks(boot_params);
-+	setup_quirks(boot_params, bzimage_addr, buffer_end - buffer_start);
-
- 	status = exit_boot(boot_params, handle);
- 	if (status != EFI_SUCCESS) {
 diff --git a/drivers/firmware/efi/secureboot.c b/drivers/firmware/efi/secureboot.c
 new file mode 100644
 index 000000000000..de0a3714a5d4
@ -888,7 +559,7 @@ index 000000000000..de0a3714a5d4
 +	}
 +}
 diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
-index 2bfbb05f7d89..a504f7234f35 100644
+index 1f276f108cc9..7039ad9bdf7f 100644
 --- a/drivers/firmware/sysfb.c
 +++ b/drivers/firmware/sysfb.c
@@ -34,6 +34,22 @@
@ -911,18 +582,37 @@ index 2bfbb05f7d89..a504f7234f35 100644
 +}
 +early_param("nvidia-drm.modeset", simpledrm_disable);
 +
- static __init int sysfb_init(void)
- {
- 	struct screen_info *si = &screen_info;
-@@ -45,7 +61,7 @@ static __init int sysfb_init(void)
+ static struct platform_device *pd;
+ static DEFINE_MUTEX(disable_lock);
+ static bool disabled;
+@@ -83,7 +99,7 @@ static __init int sysfb_init(void)

 	/* try to create a simple-framebuffer device */
 	compatible = sysfb_parse_mode(si, &mode);
 -	if (compatible) {
 +	if (compatible && !skip_simpledrm) {
- 		ret = sysfb_create_simplefb(si, &mode);
- 		if (!ret)
- 			return 0;
+ 		pd = sysfb_create_simplefb(si, &mode);
+ 		if (!IS_ERR(pd))
+ 			goto unlock_mutex;
+diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
+index 8faad23dc1d8..ca2a6e6101dc 100644
+--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
+@@ -472,7 +472,13 @@ EXPORT_SYMBOL(drm_invalid_op);
+  */
+ static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
+ {
+-	int len;
+	size_t len;
+
+	/* don't attempt to copy a NULL pointer */
+	if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) {
+		*buf_len = 0;
+		return 0;
+	}
+
+ 	/* don't overflow userbuf */
+ 	len = strlen(value);
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 311eee599ce9..2460c6bd46f8 100644
 --- a/drivers/hid/hid-rmi.c
@ -1024,7 +714,7 @@ index 311eee599ce9..2460c6bd46f8 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 7f416a12000e..68be4afaa58a 100644
+index d39660a3e50c..8e5ffb4325a3 100644
 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
 +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -9,6 +9,7 @@
@ -1035,7 +725,7 @@ index 7f416a12000e..68be4afaa58a 100644
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/fs.h>
-@@ -2171,6 +2172,16 @@ static const struct amba_id etm4_ids[] = {
+@@ -2137,6 +2138,16 @@ static const struct amba_id etm4_ids[] = {
 	{},
 };

@ -1052,7 +742,7 @@ index 7f416a12000e..68be4afaa58a 100644
 MODULE_DEVICE_TABLE(amba, etm4_ids);

 static struct amba_driver etm4x_amba_driver = {
-@@ -2204,6 +2215,11 @@ static int __init etm4x_init(void)
+@@ -2170,6 +2181,11 @@ static int __init etm4x_init(void)
 {
 	int ret;

@ -1064,7 +754,7 @@ index 7f416a12000e..68be4afaa58a 100644
 	ret = etm4_pm_setup();

 	/* etm4_pm_setup() does its own cleanup - exit on error */
-@@ -2230,6 +2246,9 @@ static int __init etm4x_init(void)
+@@ -2196,6 +2212,9 @@ static int __init etm4x_init(void)

 static void __exit etm4x_exit(void)
 {
@ -1267,7 +957,7 @@ index 258d5fe3d395..f7298e3dc8f3 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 857d4c2fd1a2..9353941f3a97 100644
+index 3a808146b50f..c1a3f3057921 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
@@ -7,6 +7,7 @@
@ -1278,7 +968,7 @@ index 857d4c2fd1a2..9353941f3a97 100644
 #include <linux/dma-iommu.h>
 #include <linux/kernel.h>
 #include <linux/bits.h>
-@@ -2870,6 +2871,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
+@@ -2843,6 +2844,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
 }
 EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);

@ -1307,10 +997,10 @@ index 857d4c2fd1a2..9353941f3a97 100644
  * Changes the default domain of an iommu group that has *only* one device
  *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 2d6a01853109..f22cd4b9c118 100644
+index 8d5a7ae19844..f3939183c346 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
-@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
+@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)

 static blk_status_t nvme_error_status(u16 status)
 {
@ -1320,17 +1010,17 @@ index 2d6a01853109..f22cd4b9c118 100644
 	switch (status & 0x7ff) {
 	case NVME_SC_SUCCESS:
 		return BLK_STS_OK;
-@@ -330,6 +333,7 @@ enum nvme_disposition {
+@@ -340,6 +343,7 @@ enum nvme_disposition {
 	COMPLETE,
 	RETRY,
 	FAILOVER,
 +	FAILUP,
+ 	AUTHENTICATE,
 };

- static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
-@@ -337,15 +341,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
- 	if (likely(nvme_req(req)->status == 0))
- 		return COMPLETE;
+@@ -351,15 +355,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
+ 	if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED)
+ 		return AUTHENTICATE;

 -	if (blk_noretry_request(req) ||
 +	if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) ||
@ -1348,7 +1038,7 @@ index 2d6a01853109..f22cd4b9c118 100644
 	} else {
 		if (blk_queue_dying(req->q))
 			return COMPLETE;
-@@ -373,6 +378,14 @@ static inline void nvme_end_req(struct request *req)
+@@ -387,6 +392,14 @@ static inline void nvme_end_req(struct request *req)
 	blk_mq_end_request(req, status);
 }

@ -1362,19 +1052,19 @@ index 2d6a01853109..f22cd4b9c118 100644
 +
 void nvme_complete_rq(struct request *req)
 {
- 	trace_nvme_complete_rq(req);
-@@ -391,6 +404,9 @@ void nvme_complete_rq(struct request *req)
+ 	struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;
+@@ -407,6 +420,9 @@ void nvme_complete_rq(struct request *req)
 	case FAILOVER:
 		nvme_failover_req(req);
 		return;
 +	case FAILUP:
 +		nvme_failup_req(req);
 +		return;
- 	}
- }
- EXPORT_SYMBOL_GPL(nvme_complete_rq);
+ 	case AUTHENTICATE:
+ #ifdef CONFIG_NVME_AUTH
+ 		queue_work(nvme_wq, &ctrl->dhchap_auth_work);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index d464fdf978fb..acdaab3d7697 100644
+index 6ef497c75a16..c019294e1058 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@ -1410,7 +1100,7 @@ index d464fdf978fb..acdaab3d7697 100644

 	spin_lock_irqsave(&ns->head->requeue_lock, flags);
 	for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -869,8 +875,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -871,8 +877,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
 	int error = 0;

 	/* check if multipath is enabled and we have the capability */
@ -1421,18 +1111,18 @@ index d464fdf978fb..acdaab3d7697 100644

 	if (!ctrl->max_namespaces ||
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index a2b53ca63335..021e51c64cde 100644
+index 1bdf714dcd9e..10e45b82466c 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
-@@ -800,6 +800,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
+@@ -844,6 +844,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
 void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
 void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys);
 void nvme_failover_req(struct request *req);
 +void nvme_update_ana(struct request *req);
 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
 int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
- void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);
-@@ -836,6 +837,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
+ void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid);
+@@ -880,6 +881,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)
 static inline void nvme_failover_req(struct request *req)
 {
 }
@ -1443,10 +1133,10 @@ index a2b53ca63335..021e51c64cde 100644
 {
 }
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 41aeaa235132..e8137d31cc93 100644
+index 4944798e75b5..079a29ef1bf2 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4285,6 +4285,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
 				quirk_bridge_cavm_thrx2_pcie_root);

@ -1478,10 +1168,10 @@ index 41aeaa235132..e8137d31cc93 100644
  * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
  * class code.  Fix it.
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 1460857026e0..7e1964891089 100644
+index bbab424b0d55..ed86042fb57b 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5688,6 +5688,13 @@ static void hub_event(struct work_struct *work)
+@@ -5676,6 +5676,13 @@ static void hub_event(struct work_struct *work)
 			(u16) hub->change_bits[0],
 			(u16) hub->event_bits[0]);

@ -1496,7 +1186,7 @@ index 1460857026e0..7e1964891089 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 cc6d2be2ffd5..418d814d2eb7 100644
+index d2b84c2fec39..3498d72b62ec 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -1508,23 +1198,7 @@ index cc6d2be2ffd5..418d814d2eb7 100644
 typedef unsigned long efi_status_t;
 typedef u8 efi_bool_t;
 typedef u16 efi_char16_t;		/* UNICODE character */
-@@ -385,6 +387,7 @@ void efi_native_runtime_setup(void);
- #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
- #define EFI_LOAD_FILE2_PROTOCOL_GUID		EFI_GUID(0x4006c0c1, 0xfcb3, 0x403e,  0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d)
- #define EFI_RT_PROPERTIES_TABLE_GUID		EFI_GUID(0xeb66918a, 0x7eef, 0x402a,  0x84, 0x2e, 0x93, 0x1d, 0x21, 0xc3, 0x8a, 0xe9)
-+#define EFI_DXE_SERVICES_TABLE_GUID		EFI_GUID(0x05ad34ba, 0x6f02, 0x4214,  0x95, 0x2e, 0x4d, 0xa0, 0x39, 0x8e, 0x2b, 0xb9)
-
- #define EFI_IMAGE_SECURITY_DATABASE_GUID	EFI_GUID(0xd719b2cb, 0x3d3a, 0x4596,  0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f)
- #define EFI_SHIM_LOCK_GUID			EFI_GUID(0x605dab50, 0xe046, 0x4300,  0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23)
-@@ -437,6 +440,7 @@ typedef struct {
- } efi_config_table_type_t;
-
- #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
-+#define EFI_DXE_SERVICES_TABLE_SIGNATURE ((u64)0x565245535f455844ULL)
-
- #define EFI_2_30_SYSTEM_TABLE_REVISION  ((2 << 16) | (30))
- #define EFI_2_20_SYSTEM_TABLE_REVISION  ((2 << 16) | (20))
-@@ -831,6 +835,14 @@ extern int __init efi_setup_pcdp_console(char *);
+@@ -849,6 +851,14 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
 #define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */
 #define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */
@ -1539,7 +1213,7 @@ index cc6d2be2ffd5..418d814d2eb7 100644

 #ifdef CONFIG_EFI
 /*
-@@ -842,6 +854,8 @@ static inline bool efi_enabled(int feature)
+@@ -860,6 +870,8 @@ static inline bool efi_enabled(int feature)
 }
 extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);

@ -1548,7 +1222,7 @@ index cc6d2be2ffd5..418d814d2eb7 100644
 bool __pure __efi_soft_reserve_enabled(void);

 static inline bool __pure efi_soft_reserve_enabled(void)
-@@ -862,6 +876,8 @@ static inline bool efi_enabled(int feature)
+@@ -881,6 +893,8 @@ static inline bool efi_enabled(int feature)
 static inline void
 efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}

@ -1557,7 +1231,7 @@ index cc6d2be2ffd5..418d814d2eb7 100644
 static inline bool efi_soft_reserve_enabled(void)
 {
 	return false;
-@@ -874,6 +890,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
+@@ -895,6 +909,7 @@ static inline void efi_find_mirror(void) {}
 #endif

 extern int efi_status_to_err(efi_status_t status);
@ -1565,7 +1239,7 @@ index cc6d2be2ffd5..418d814d2eb7 100644

 /*
  * Variable Attributes
-@@ -1126,13 +1143,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+@@ -1107,13 +1122,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
 extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
 extern unsigned long efi_call_virt_save_flags(void);

@ -1580,10 +1254,10 @@ index cc6d2be2ffd5..418d814d2eb7 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 db924fe379c9..1169d78af2de 100644
+index 60fff133c0b1..fa0aa514c70f 100644
 --- a/include/linux/lsm_hook_defs.h
 +++ b/include/linux/lsm_hook_defs.h
-@@ -394,6 +394,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
+@@ -395,6 +395,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
 #endif /* CONFIG_BPF_SYSCALL */

 LSM_HOOK(int, 0, locked_down, enum lockdown_reason what)
@ -1593,10 +1267,10 @@ index db924fe379c9..1169d78af2de 100644
 #ifdef CONFIG_PERF_EVENTS
 LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
 diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
-index 419b5febc3ca..491323dfe4e0 100644
+index 3aa6030302f5..23b63de268a3 100644
 --- a/include/linux/lsm_hooks.h
 +++ b/include/linux/lsm_hooks.h
-@@ -1549,6 +1549,12 @@
+@@ -1557,6 +1557,12 @@
  *
  *     @what: kernel feature being accessed
  *
@ -1622,10 +1296,10 @@ index ab7eea01ab42..fff7c5f737fc 100644

 int rmi_register_transport_device(struct rmi_transport_dev *xport);
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 7fc4e9f49f54..6f0b0b2dc73d 100644
+index 7bd0c490703d..7779eaf1ffa1 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
+@@ -475,6 +475,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
 int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
 int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
 int security_locked_down(enum lockdown_reason what);
@ -1633,7 +1307,7 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
 #else /* CONFIG_SECURITY */

 static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
-@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what)
+@@ -1358,6 +1359,10 @@ static inline int security_locked_down(enum lockdown_reason what)
 {
 	return 0;
 }
@ -1645,10 +1319,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644

 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index b19e2eeaae80..7d12d49b9024 100644
+index 532362fcfe31..30d547537ea0 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1654,7 +1654,7 @@ config AIO
+@@ -1678,7 +1678,7 @@ config AIO
 	  this option saves about 7k.

 config IO_URING
@ -1657,11 +1331,11 @@ index b19e2eeaae80..7d12d49b9024 100644
 	select IO_WQ
 	default y
 	help
-diff --git a/kernel/module_signing.c b/kernel/module_signing.c
-index 8723ae70ea1f..fb2d773498c2 100644
--- a/kernel/module_signing.c
-+++ b/kernel/module_signing.c
-@@ -38,8 +38,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)
+diff --git a/kernel/module/signing.c b/kernel/module/signing.c
+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)
 	modlen -= sig_len + sizeof(ms);
 	info->len = modlen;

@ -1678,8 +1352,10 @@ index 8723ae70ea1f..fb2d773498c2 100644
 +	}
 +	return ret;
 }
+
+ int module_sig_check(struct load_info *info, int flags)
 diff --git a/scripts/tags.sh b/scripts/tags.sh
-index 16d475b3e203..4e333f14b84e 100755
+index e137cf15aae9..2ed2341f7967 100755
 --- a/scripts/tags.sh
 +++ b/scripts/tags.sh
@@ -16,6 +16,8 @@ fi
@ -1752,10 +1428,10 @@ index 87cbdc64d272..18555cf18da7 100644

 static int __init lockdown_lsm_init(void)
 diff --git a/security/security.c b/security/security.c
-index aaf6566deb9f..86926966c15d 100644
+index 4b95de24bc8d..10047790e96e 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -2625,6 +2625,12 @@ int security_locked_down(enum lockdown_reason what)
+@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what)
 }
 EXPORT_SYMBOL(security_locked_down);

--- a/process_configs.sh
+++ b/process_configs.sh
@ -269,7 +269,6 @@ function process_config()
 	then
 		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
 		cat .warnings"${count}" >> .errors"${count}"
-		rm .warnings"${count}"
 	fi
 	rm .warnings"${count}"

--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -23,4 +23,4 @@ emptyrpm:
 patches:
    ignore_list:
        - linux-kernel-test.patch
-        - patch-5.18-redhat.patch
+        - patch-6.0-redhat.patch
--- a/6
+++ b/6
@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
-SHA512 (linux-5.18.3.tar.xz) = fd238473a3216e1fbdaefd983adb9fc5b3bb1f6d50cdee8ce20f7b894af1558d0664a7d8b0e47eb72943ffb127582d9fc5c9b8ef0a461ad5b689389c33814391
-SHA512 (kernel-abi-stablelists-5.18.3-200.tar.bz2) = e557b3409a2ac0af4a01a41ad082bd4ad0adb83de075b3df473e66f59299052e161cd3f83a329fd9e69405d41e64479c37c908557de54772cc5093932d4797f7
-SHA512 (kernel-kabi-dw-5.18.3-200.tar.bz2) = fd295588c7bf44f52530eef6801ac19fc2db90721987279223daf23bc393775b8fd1f96faebf551201256d76c3c9263256e7de9eaa4635a66d2b2acb108e92c5
+SHA512 (linux-6.0.tar.xz) = b0f06f089c2ff42b59038c14f3d2b26f2f5510eda13057261239a3cb8fdea0c114e76842dd9676ed4187820ac9af8018ef0d2ca18a4507a3bf3cd47c9aba7b56
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = d8c014b9656350d5facb370ad2e066a55d689660da6acc45ad31f9fce814708fde424597f91572aa2fc1691f48911220fe643d7f1a79b21db35c2a4249fdeae4
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = ddee497fc356ccc0633b7f9cb26906bb7751828427f9a712d37748d786d39e6ad7894f58560d762a6d0ca28a0289a24638fe4bd69eeb92427bb0ee4e7fdc7271