Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora

24 files changed, 51 insertions, 27 deletions

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c97c72be3..bb4dadfcd 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2021,6 +2021,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index f4b885a28..ecaa334b0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1532,6 +1532,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e3f5768dd..983578a83 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2013,6 +2013,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 84dfd5e1c..8d09661b6 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1524,6 +1524,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 709795bf2..49f6bf2e4 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2047,6 +2047,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index f10d9f801..9e0241832 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2040,6 +2040,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 4d8c4a90c..99b1bf0c5 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2001,6 +2001,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 7cba7f248..74e02ea35 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1994,6 +1994,7 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 6fe0131c3..419e6d6b4 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1589,6 +1589,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d69695e57..52ce94404 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1381,6 +1381,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 1e244f858..3627f5f6d 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1580,6 +1580,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index d24ef1b16..119074c2d 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1373,6 +1373,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 84e523a25..0ba011c86 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1596,6 +1596,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 81a14a9c1..1ac0f72ab 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1385,6 +1385,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0c6d1f911..de32641dc 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1587,6 +1587,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 69cdba9ee..426930f65 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1377,6 +1377,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index d9c8b6ae1..7aa84a32a 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1383,6 +1383,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index b62de1508..6a7f301fa 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1737,6 +1737,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 1931d9279..312c13e0c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1480,6 +1480,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 685d31c32..931b981fb 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1728,6 +1728,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 03d4ba52f..8ea581158 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1472,6 +1472,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_EFI_DXE_MEM_ATTRIBUTES=y
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
diff --git a/kernel.spec b/kernel.spec
index 327ff9586..fa4f225e6 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -3020,6 +3020,9 @@ fi
 #
 #
 %changelog
+* Thu Jun 09 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.14-0]
+- Config updates for stable backports (Justin M. Forbes)
+
 * Mon Jun 06 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.13-0]
 - Drop F34 from release targets (Justin M. Forbes)
 - Add the fedora-stable-release.sh script to generate stable dist-git (Justin M. Forbes)
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 539c634ac..9260e605f 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -109,7 +109,7 @@ index 000000000000..733a26bd887a
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index d38228d336bf..5afb968d0add 100644
+index 5450a2c9efa6..55c84f323a7d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -439,7 +439,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 f1827257ef0e..5a45c2cd3dc2 100644
+index 2610e809c802..4f04a6bcf2e9 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -35,6 +35,7 @@
@@ -474,7 +474,7 @@ index f1827257ef0e..5a45c2cd3dc2 100644
  	rv = ipmi_register_driver();
  	mutex_unlock(&ipmi_interfaces_mutex);
 diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
-index 2c3dac5ecb36..f44f8b746e42 100644
+index 243882f5e5f9..4a0fa81a563d 100644
 --- a/drivers/firmware/efi/Kconfig
 +++ b/drivers/firmware/efi/Kconfig
 @@ -91,6 +91,18 @@ config EFI_SOFT_RESERVE
@@ -509,7 +509,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 5502e176d51b..93b61ca552d6 100644
+index ff57db8f8d05..d7dfde3260bf 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -31,6 +31,7 @@
@@ -1438,7 +1438,7 @@ index 107dcf5938d6..225a9797e39d 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 0abd772c57f0..3c9889ce56ac 100644
+index e086440a2042..44977ed5d13d 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1604,10 +1604,10 @@ index 9037a7827eca..e5900638483b 100644
 
  	pcibios_free_irq(dev);
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index da829274fc66..bb6e79ec3d00 100644
+index 41aeaa235132..e8137d31cc93 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4284,6 +4284,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4285,6 +4285,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);
 
@@ -1723,7 +1723,7 @@ index dca2b1355bb1..6150d11a607e 100644
   * A dma_addr_t can hold any valid DMA or bus address for the platform.  It can
   * be given to a device to use as a DMA source or target.  It is specific to a
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ccd4d3f91c98..2241dfa131e7 100644
+index cc6d2be2ffd5..418d814d2eb7 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -43,6 +43,8 @@
@@ -1735,7 +1735,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
  typedef unsigned long efi_status_t;
  typedef u8 efi_bool_t;
  typedef u16 efi_char16_t;		/* UNICODE character */
-@@ -383,6 +385,7 @@ void efi_native_runtime_setup(void);
+@@ -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)
@@ -1743,7 +1743,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
 
  #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)
-@@ -435,6 +438,7 @@ typedef struct {
+@@ -437,6 +440,7 @@ typedef struct {
  } efi_config_table_type_t;
 
  #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
@@ -1751,7 +1751,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
 
  #define EFI_2_30_SYSTEM_TABLE_REVISION  ((2 << 16) | (30))
  #define EFI_2_20_SYSTEM_TABLE_REVISION  ((2 << 16) | (20))
-@@ -829,6 +833,14 @@ extern int __init efi_setup_pcdp_console(char *);
+@@ -831,6 +835,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? */
@@ -1766,7 +1766,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
 
  #ifdef CONFIG_EFI
  /*
-@@ -840,6 +852,8 @@ static inline bool efi_enabled(int feature)
+@@ -842,6 +854,8 @@ static inline bool efi_enabled(int feature)
  }
  extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
 
@@ -1775,7 +1775,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
  bool __pure __efi_soft_reserve_enabled(void);
 
  static inline bool __pure efi_soft_reserve_enabled(void)
-@@ -860,6 +874,8 @@ static inline bool efi_enabled(int feature)
+@@ -862,6 +876,8 @@ static inline bool efi_enabled(int feature)
  static inline void
  efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
 
@@ -1784,7 +1784,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
  static inline bool efi_soft_reserve_enabled(void)
  {
  	return false;
-@@ -872,6 +888,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
+@@ -874,6 +890,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
  #endif
 
  extern int efi_status_to_err(efi_status_t status);
@@ -1792,7 +1792,7 @@ index ccd4d3f91c98..2241dfa131e7 100644
 
  /*
   * Variable Attributes
-@@ -1124,13 +1141,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+@@ -1126,13 +1143,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);
 
@@ -1837,10 +1837,10 @@ index 419b5febc3ca..491323dfe4e0 100644
   *
   * @perf_event_open:
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 1e135fd5c076..6ec4d001c1e2 100644
+index d5e9066990ca..23ffbf466a48 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -381,6 +381,7 @@ struct module {
+@@ -380,6 +380,7 @@ struct module {
  	struct module_attribute *modinfo_attrs;
  	const char *version;
  	const char *srcversion;
@@ -1849,7 +1849,7 @@ index 1e135fd5c076..6ec4d001c1e2 100644
 
  	/* Exported symbols */
 diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
-index ca0959e51e81..b0e3fd550122 100644
+index 1fdf560dddd8..bac7a34324c5 100644
 --- a/include/linux/nfs_fs_sb.h
 +++ b/include/linux/nfs_fs_sb.h
 @@ -151,6 +151,7 @@ struct nfs_server {
@@ -1896,10 +1896,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index e9119bf54b1f..e3b57b4898fe 100644
+index 4a7a569706c5..bc8f25fcfe0d 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1645,7 +1645,7 @@ config AIO
+@@ -1650,7 +1650,7 @@ config AIO
  	  this option saves about 7k.
 
  config IO_URING
@@ -1932,7 +1932,7 @@ index 6c350555e5a1..bfc56cb21705 100644
  }
 
 diff --git a/kernel/module.c b/kernel/module.c
-index 46a5c2ed1928..92c2306651ce 100644
+index 740323cff545..7828a8946781 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -743,6 +743,7 @@ static struct module_attribute modinfo_##field = {                    \
@@ -2034,10 +2034,10 @@ index 16d475b3e203..4e333f14b84e 100755
  # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope}
  # to force full paths for a non-O= build
 diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
-index 08b6d12f99b4..61b596236d53 100644
+index a031522351c9..7c2ae3104441 100644
 --- a/security/integrity/platform_certs/load_uefi.c
 +++ b/security/integrity/platform_certs/load_uefi.c
-@@ -47,7 +47,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
+@@ -73,7 +73,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
  		return NULL;
 
  	if (*status != EFI_BUFFER_TOO_SMALL) {
@@ -2047,7 +2047,7 @@ index 08b6d12f99b4..61b596236d53 100644
  		return NULL;
  	}
 
-@@ -58,7 +59,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
+@@ -84,7 +85,8 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
  	*status = efi.get_variable(name, guid, NULL, &lsize, db);
  	if (*status != EFI_SUCCESS) {
  		kfree(db);
diff --git a/sources b/sources
index 371212459..f6e4039c1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17.13.tar.xz) = ff9800e18d7d3d979d1298dc68c7bbcd71ee0e67163e18e1ac327e95cff23434074fcca75cc199e0876b7053036e9387bca075af22756da442e53c3823d231dc
-SHA512 (kernel-abi-stablelists-5.17.13-300.tar.bz2) = 7232560b2bdabfa81be29a358ce271a1dd389b624342e6c3b1ac5964d69277161071f99f94d251babdbbc9f58515c94636593209b5605d3f37e008a3f2d59592
-SHA512 (kernel-kabi-dw-5.17.13-300.tar.bz2) = 791144af8e4890ff6bbd101960cf0cffb6fe538a0faa09b7422532c3a27e6fe3a922b9f6a658c118403f820e1d896921dfe9b8e77bb37e984fd84cb06e24935e
+SHA512 (linux-5.17.14.tar.xz) = 856f934418c8b3afb6d31d06789dc45a7ef357bc7b539bcf558c27bbc5faba10bd04eb75425f61bb1e23c26c94ca0ab982a7b08f334ce67b82daaea7f53b0e68
+SHA512 (kernel-abi-stablelists-5.17.14-300.tar.bz2) = 1f7941dcc2d1501b1eaec33b21969d0a631b40998a7c310b1b57b9d3be577e638530b8052af813ab8ca4b1c283cfea996ff77cd0eb679dde9385e1bf849118a2
+SHA512 (kernel-kabi-dw-5.17.14-300.tar.bz2) = fd295588c7bf44f52530eef6801ac19fc2db90721987279223daf23bc393775b8fd1f96faebf551201256d76c3c9263256e7de9eaa4635a66d2b2acb108e92c5