Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32

55 files changed, 242 insertions, 165 deletions

diff --git a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch
index e0b8cd910..283ac06f1 100644
--- a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch
+++ b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch
@@ -51,7 +51,7 @@ Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index a13d90206472..6a6aae01755b 100644
+index b5fdd30252f8..d43ceaa78269 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
 @@ -195,11 +195,12 @@ extern int __get_user_64t_4(void *);
diff --git a/0001-ARM-tegra-usb-no-reset.patch b/0001-ARM-tegra-usb-no-reset.patch
index 1ee8f583b..9e22a3225 100644
--- a/0001-ARM-tegra-usb-no-reset.patch
+++ b/0001-ARM-tegra-usb-no-reset.patch
@@ -10,7 +10,7 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 5b768b80d1ee..6929b6b5186b 100644
+index 052d5accfe9b..fac58cf619da 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -5517,6 +5517,13 @@ static void hub_event(struct work_struct *work)
diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch
index 216881e1d..02f5d2c85 100644
--- a/0001-Add-Red-Hat-tainting.patch
+++ b/0001-Add-Red-Hat-tainting.patch
@@ -100,10 +100,10 @@ Signed-off-by: Philipp Rudo <prudo@redhat.com>
  create mode 100644 kernel/rh_taint.c
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index c25b8e41c0ea..c3dd56bf044f 100644
+index 7339a00c895e..19291af895eb 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -1037,4 +1037,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+@@ -1039,4 +1039,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
  	 /* OTHER_WRITABLE?  Generally considered a bad idea. */		\
  	 BUILD_BUG_ON_ZERO((perms) & 2) +					\
  	 (perms))
@@ -124,7 +124,7 @@ index c25b8e41c0ea..c3dd56bf044f 100644
 +
  #endif
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 9a20016d4900..4fbfd2a0800c 100644
+index 5350fd292910..d744b63c07dc 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -13,6 +13,7 @@ obj-y     = fork.o exec_domain.o panic.o \
diff --git a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
index e351498af..79118e12f 100644
--- a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
+++ b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 96 insertions(+), 31 deletions(-)
 
 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 3aa07c3b5136..833c35abd009 100644
+index fdd1db025dbf..8ef7d1df09dd 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -31,6 +31,7 @@
@@ -26,7 +26,7 @@ index 3aa07c3b5136..833c35abd009 100644
 
  #include <asm/early_ioremap.h>
 
-@@ -833,40 +834,101 @@ int efi_mem_type(unsigned long phys_addr)
+@@ -831,40 +832,101 @@ int efi_mem_type(unsigned long phys_addr)
  }
  #endif
 
diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
index 4b9a64511..fb968c95c 100644
--- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
+++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 60a89b5e57b3..165d602481fe 100644
+index 74c5325108c0..5aa22996be8c 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -1133,6 +1133,7 @@ config XEN
diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch
index 3dcd928eb..8b813bfa6 100644
--- a/0001-Drop-that-for-now.patch
+++ b/0001-Drop-that-for-now.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Drop that for now
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 53bbe4be5a69..9d060d6f3037 100644
+index b70997f7ddf9..680d906eee35 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -497,7 +497,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
+@@ -498,7 +498,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
  KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
  		   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
  		   -Werror=implicit-function-declaration -Werror=implicit-int \
diff --git a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
index 81e39232b..2c767b464 100644
--- a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
+++ b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
@@ -16,7 +16,7 @@ CC: Mark Salter <msalter@redhat.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index 2e4ba374ab54..7630e22e1722 100644
+index 5cb0d548ec25..999f0a232e57 100644
 --- a/arch/arm64/kernel/acpi.c
 +++ b/arch/arm64/kernel/acpi.c
 @@ -40,7 +40,11 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
diff --git a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
index 3b86f4266..3a6d56590 100644
--- a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
+++ b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch
@@ -41,10 +41,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
-index 77f2c7cd1216..aea28fb3d6a9 100644
+index 907203afbd99..6fbbe2b109d1 100644
 --- a/drivers/infiniband/sw/rxe/rxe.c
 +++ b/drivers/infiniband/sw/rxe/rxe.c
-@@ -305,6 +305,8 @@ static int __init rxe_module_init(void)
+@@ -303,6 +303,8 @@ static int __init rxe_module_init(void)
  {
  	int err;
 
diff --git a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
index 57174c6f4..7804610d1 100644
--- a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
+++ b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch
@@ -22,7 +22,7 @@ Signed-off-by: Lyude <lyude@redhat.com>
  3 files changed, 75 insertions(+), 114 deletions(-)
 
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
-index 7f41213d5ae3..86a23ede344c 100644
+index 8cffa84c9650..6c4e3675601a 100644
 --- a/drivers/hid/hid-rmi.c
 +++ b/drivers/hid/hid-rmi.c
 @@ -322,19 +322,12 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
@@ -45,7 +45,7 @@ index 7f41213d5ae3..86a23ede344c 100644
  	return 1;
  }
 
-@@ -591,56 +584,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
+@@ -592,56 +585,6 @@ static const struct rmi_transport_ops hid_rmi_ops = {
  	.reset		= rmi_hid_reset,
  };
 
@@ -102,7 +102,7 @@ index 7f41213d5ae3..86a23ede344c 100644
  static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
  	struct rmi_data *data = NULL;
-@@ -713,18 +656,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -714,18 +657,11 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
  	mutex_init(&data->page_mutex);
 
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
index f39429a5a..cb2475171 100644
--- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
+++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
@@ -51,10 +51,10 @@ index a1a012702915..b57e6dd6d7ef 100644
  #endif
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 156d1e44d9f7..e355907f5d6c 100644
+index f24819663517..3ab563aa9e64 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -1057,7 +1057,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+@@ -1059,7 +1059,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 
  struct module;
 
@@ -64,7 +64,7 @@ index 156d1e44d9f7..e355907f5d6c 100644
  void mark_hardware_deprecated(const char *msg);
  void mark_tech_preview(const char *msg, struct module *mod);
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 4fbfd2a0800c..a591962f7906 100644
+index d744b63c07dc..1916714ba4b6 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -14,6 +14,7 @@ obj-y     = fork.o exec_domain.o panic.o \
diff --git a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch
index 96e36789a..7f2495805 100644
--- a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch
+++ b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch
@@ -36,7 +36,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 24 insertions(+)
 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 2a589b6d6ed8..a2b2333e6ab1 100644
+index bdf9b52567e0..1e98e20b7cc2 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -4196,6 +4196,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
diff --git a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch
index 2f3a6259d..6e9dcbbcf 100644
--- a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch
+++ b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch
@@ -27,7 +27,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index a3aee146537b..cf50fa206890 100644
+index 8588da0a0655..2bc9157fb5d3 100644
 --- a/drivers/scsi/aacraid/linit.c
 +++ b/drivers/scsi/aacraid/linit.c
 @@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
index 044990b33..dbb6726b4 100644
--- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
+++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
@@ -39,7 +39,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index a85174d05473..2e4ba374ab54 100644
+index 455966401102..5cb0d548ec25 100644
 --- a/arch/arm64/kernel/acpi.c
 +++ b/arch/arm64/kernel/acpi.c
 @@ -40,7 +40,7 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch
index a157b6d6e..8179d8390 100644
--- a/0001-add-Red-Hat-specific-taint-flags.patch
+++ b/0001-add-Red-Hat-specific-taint-flags.patch
@@ -24,10 +24,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  2 files changed, 32 insertions(+), 1 deletion(-)
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index c3dd56bf044f..f14f238dc36a 100644
+index 19291af895eb..ae2859863d59 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -602,7 +602,24 @@ extern enum system_states {
+@@ -604,7 +604,24 @@ extern enum system_states {
  #define TAINT_LIVEPATCH			15
  #define TAINT_AUX			16
  #define TAINT_RANDSTRUCT		17
@@ -54,7 +54,7 @@ index c3dd56bf044f..f14f238dc36a 100644
 
  struct taint_flag {
 diff --git a/kernel/panic.c b/kernel/panic.c
-index aef8872ba843..fe1d3decf61c 100644
+index e2157ca387c8..534bc76e43da 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
index 293de5ba1..eb02c33dc 100644
--- a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
+++ b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 6d232837cbee..60a89b5e57b3 100644
+index e11b4ea06127..74c5325108c0 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -861,7 +861,7 @@ endchoice
diff --git a/0001-be2iscsi-remove-unsupported-device-IDs.patch b/0001-be2iscsi-remove-unsupported-device-IDs.patch
index 15d3dc87e..307a96a10 100644
--- a/0001-be2iscsi-remove-unsupported-device-IDs.patch
+++ b/0001-be2iscsi-remove-unsupported-device-IDs.patch
@@ -49,7 +49,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
-index 5c3513a4b450..0d59aca2cf58 100644
+index 8dc2e0824ad7..dfb9d0ae3247 100644
 --- a/drivers/scsi/be2iscsi/be_main.c
 +++ b/drivers/scsi/be2iscsi/be_main.c
 @@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
index 6b908842c..0c6cecfe2 100644
--- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch
+++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
@@ -27,7 +27,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 5e5ac50d9137..ce77b8dfe47a 100644
+index f7e570292afe..56c39dc8995e 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
 @@ -4155,11 +4155,17 @@ static int bpf_iter_create(union bpf_attr *attr)
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
index 0f1a5f976..5f8a8c404 100644
--- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
+++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
@@ -34,10 +34,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  4 files changed, 30 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index a1068742a6df..aba9439caec9 100644
+index 98ea67f27809..352afb16f424 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5370,6 +5370,14 @@
+@@ -5373,6 +5373,14 @@
  	unknown_nmi_panic
  			[X86] Cause panic on unknown NMI.
 
@@ -53,10 +53,10 @@ index a1068742a6df..aba9439caec9 100644
  			[USB] Default USB device authorization:
  			(default -1 = authorized except for wireless USB,
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index f14f238dc36a..156d1e44d9f7 100644
+index ae2859863d59..f24819663517 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -617,7 +617,7 @@ extern enum system_states {
+@@ -619,7 +619,7 @@ extern enum system_states {
  #define TAINT_RESERVED28		28
  #define TAINT_RESERVED29		29
  #define TAINT_RESERVED30		30
@@ -66,7 +66,7 @@ index f14f238dc36a..156d1e44d9f7 100644
  #define TAINT_FLAGS_COUNT		32
  #define TAINT_FLAGS_MAX			((1UL << TAINT_FLAGS_COUNT) - 1)
 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index b999e7ff2583..5e5ac50d9137 100644
+index 2f343ce15747..f7e570292afe 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
 @@ -24,6 +24,7 @@
@@ -105,7 +105,7 @@ index b999e7ff2583..5e5ac50d9137 100644
  static const struct bpf_map_ops * const bpf_map_types[] = {
  #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
 diff --git a/kernel/panic.c b/kernel/panic.c
-index fe1d3decf61c..2c483bec82d6 100644
+index 534bc76e43da..e3bae852d92f 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
index b53e7c666..6a0e42856 100644
--- a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
+++ b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
@@ -13,7 +13,7 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index de8a11abd66a..7e8c1a3c9b8f 100644
+index aa67cb037e9d..52e009dc632b 100644
 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
 +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
 @@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
diff --git a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
index 425b07161..60250b293 100644
--- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
+++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
@@ -24,7 +24,7 @@ Upstream Status: RHEL only
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 48d5da59262b..84d90eedb067 100644
+index 91794a50b31f..0c3dd00e8664 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
 @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
diff --git a/0001-kdump-add-support-for-crashkernel-auto.patch b/0001-kdump-add-support-for-crashkernel-auto.patch
index 0cb1da786..8bb55fd3c 100644
--- a/0001-kdump-add-support-for-crashkernel-auto.patch
+++ b/0001-kdump-add-support-for-crashkernel-auto.patch
@@ -160,10 +160,10 @@ index 2da65fef2a1c..d53a524f80f0 100644
 
  Boot into System Kernel
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index 0b3f738178b8..a04650f7f6c2 100644
+index e4dfe2a05a31..8c6f59932247 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
-@@ -260,6 +260,20 @@ static int __init __parse_crashkernel(char *cmdline,
+@@ -258,6 +258,20 @@ static int __init __parse_crashkernel(char *cmdline,
  	if (suffix)
  		return parse_crashkernel_suffix(ck_cmdline, crash_size,
  				suffix);
diff --git a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
index 720ea3439..78f372150 100644
--- a/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
+++ b/0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch
@@ -26,10 +26,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index a04650f7f6c2..09a4870fe1fb 100644
+index 8c6f59932247..598d8324f51a 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
-@@ -271,7 +271,7 @@ static int __init __parse_crashkernel(char *cmdline,
+@@ -269,7 +269,7 @@ static int __init __parse_crashkernel(char *cmdline,
  #elif defined(CONFIG_PPC64)
  		ck_cmdline = "2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G";
  #endif
diff --git a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
index 0b8e74fd4..6e32c19ae 100644
--- a/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
+++ b/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
@@ -45,7 +45,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index 106e4500fd53..0b3f738178b8 100644
+index 18175687133a..e4dfe2a05a31 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
 @@ -7,6 +7,7 @@
@@ -56,7 +56,7 @@ index 106e4500fd53..0b3f738178b8 100644
 
  #include <asm/page.h>
  #include <asm/sections.h>
-@@ -41,6 +42,15 @@ static int __init parse_crashkernel_mem(char *cmdline,
+@@ -39,6 +40,15 @@ static int __init parse_crashkernel_mem(char *cmdline,
  					unsigned long long *crash_base)
  {
  	char *cur = cmdline, *tmp;
@@ -72,7 +72,7 @@ index 106e4500fd53..0b3f738178b8 100644
 
  	/* for each entry of the comma-separated list */
  	do {
-@@ -85,13 +95,13 @@ static int __init parse_crashkernel_mem(char *cmdline,
+@@ -83,13 +93,13 @@ static int __init parse_crashkernel_mem(char *cmdline,
  			return -EINVAL;
  		}
  		cur = tmp;
diff --git a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
index 75fd7a2f3..e07ddff84 100644
--- a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
+++ b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch
@@ -23,10 +23,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index e355907f5d6c..7a7a47665771 100644
+index 3ab563aa9e64..b40d76529ddd 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -612,7 +612,7 @@ extern enum system_states {
+@@ -614,7 +614,7 @@ extern enum system_states {
  #define TAINT_24			24
  #define TAINT_25			25
  #define TAINT_26			26
@@ -36,7 +36,7 @@ index e355907f5d6c..7a7a47665771 100644
  #define TAINT_RESERVED28		28
  #define TAINT_RESERVED29		29
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 2c483bec82d6..e1f2bf843901 100644
+index e3bae852d92f..8ab004b0f846 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -395,7 +395,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch
index a54c0e06a..292a1fe53 100644
--- a/0001-megaraid_sas-remove-deprecated-pci-ids.patch
+++ b/0001-megaraid_sas-remove-deprecated-pci-ids.patch
@@ -23,7 +23,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 2b7e7b5f38ed..b3bacfdcb727 100644
+index 861f7140f52e..8c08ca7954a4 100644
 --- a/drivers/scsi/megaraid/megaraid_sas_base.c
 +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
 @@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
diff --git a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
index d4dfa6d37..a8bf98d50 100644
--- a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
+++ b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch
@@ -51,10 +51,10 @@ Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index 5e252d91eb14..c6e1a9443e9e 100644
+index e362dc3d2028..0c3dfb8eef67 100644
 --- a/mm/kmemleak.c
 +++ b/mm/kmemleak.c
-@@ -1960,6 +1960,11 @@ void __init kmemleak_init(void)
+@@ -1958,6 +1958,11 @@ void __init kmemleak_init(void)
   */
  static int __init kmemleak_late_init(void)
  {
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
index ba72b5125..fc37505d0 100644
--- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
+++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
@@ -82,7 +82,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
  3 files changed, 11 insertions(+)
 
 diff --git a/include/linux/module.h b/include/linux/module.h
-index e30ed5fa33a7..b960ea38d185 100644
+index 2e6670860d27..8c35a5db7d7e 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -371,6 +371,7 @@ struct module {
@@ -94,10 +94,10 @@ index e30ed5fa33a7..b960ea38d185 100644
 
  	/* Exported symbols */
 diff --git a/kernel/module.c b/kernel/module.c
-index 1c5cff34d9f2..670ceadd44d2 100644
+index 8fa2600bde6a..263e654f6212 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -805,6 +805,7 @@ static struct module_attribute modinfo_##field = {                    \
+@@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = {                    \
 
  MODINFO_ATTR(version);
  MODINFO_ATTR(srcversion);
@@ -105,7 +105,7 @@ index 1c5cff34d9f2..670ceadd44d2 100644
 
  static char last_unloaded_module[MODULE_NAME_LEN+1];
 
-@@ -1267,6 +1268,7 @@ static struct module_attribute *modinfo_attrs[] = {
+@@ -1266,6 +1267,7 @@ static struct module_attribute *modinfo_attrs[] = {
  	&module_uevent,
  	&modinfo_version,
  	&modinfo_srcversion,
diff --git a/0001-mpt-remove-certain-deprecated-pci-ids.patch b/0001-mpt-remove-certain-deprecated-pci-ids.patch
index a5177451d..4ebe0f9d5 100644
--- a/0001-mpt-remove-certain-deprecated-pci-ids.patch
+++ b/0001-mpt-remove-certain-deprecated-pci-ids.patch
@@ -35,7 +35,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
-index 2e2756d8a49b..a67a47d3fce1 100644
+index 08fc4b381056..1305a2b72536 100644
 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
 +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
 @@ -11033,6 +11033,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
diff --git a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch
index acf088c66..14bf0fb3e 100644
--- a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch
+++ b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch
@@ -31,7 +31,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index 18b91ea1a353..38d8b2bb3a37 100644
+index 6a79cd0ebe2b..c17614cd6ed8 100644
 --- a/drivers/message/fusion/mptsas.c
 +++ b/drivers/message/fusion/mptsas.c
 @@ -5290,6 +5290,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/0001-mptsas-pci-id-table-changes.patch b/0001-mptsas-pci-id-table-changes.patch
index 8719bbbf1..e77e863a4 100644
--- a/0001-mptsas-pci-id-table-changes.patch
+++ b/0001-mptsas-pci-id-table-changes.patch
@@ -31,7 +31,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index 38d8b2bb3a37..b71f77a5799f 100644
+index c17614cd6ed8..ca44a35ec411 100644
 --- a/drivers/message/fusion/mptsas.c
 +++ b/drivers/message/fusion/mptsas.c
 @@ -5358,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev)
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch
index a2afcbf29..0f3df37c2 100644
--- a/0001-put-RHEL-info-into-generated-headers.patch
+++ b/0001-put-RHEL-info-into-generated-headers.patch
@@ -59,10 +59,10 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 992d24467ca0..53bbe4be5a69 100644
+index 168dd19cad7c..b70997f7ddf9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1245,7 +1245,13 @@ endef
+@@ -1246,7 +1246,13 @@ endef
  define filechk_version.h
  	echo \#define LINUX_VERSION_CODE $(shell                         \
  	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
diff --git a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch
index ff8a02ee7..9611ea53e 100644
--- a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch
+++ b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch
@@ -44,10 +44,10 @@ Note: Simplified backport to just pci-ids
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index 8da00ba54aec..cf5ccbdd7fbc 100644
+index 9b59f032a569..c27e39378aa9 100644
 --- a/drivers/scsi/qla2xxx/qla_os.c
 +++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -7796,6 +7796,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
+@@ -7795,6 +7795,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
  };
 
  static struct pci_device_id qla2xxx_pci_tbl[] = {
@@ -55,7 +55,7 @@ index 8da00ba54aec..cf5ccbdd7fbc 100644
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
-@@ -7808,13 +7809,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
+@@ -7807,13 +7808,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
diff --git a/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch
index 12ee3c9ff..1afd52baf 100644
--- a/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch
+++ b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch
@@ -32,7 +32,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 676778cbc550..e41772d11f26 100644
+index bab87e47b238..70545ee26c9c 100644
 --- a/drivers/scsi/qla4xxx/ql4_os.c
 +++ b/drivers/scsi/qla4xxx/ql4_os.c
 @@ -9868,6 +9868,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
index 12eadc312..6613f6a35 100644
--- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
+++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
@@ -41,7 +41,7 @@ index 90a2a17239b0..be3b72c53656 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index c2c1b4e723ea..1247f80a3bf0 100644
+index e600f6953d7c..4264e01824b3 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
 @@ -49,6 +49,7 @@
diff --git a/0001-scsi-smartpqi-add-inspur-advantech-ids.patch b/0001-scsi-smartpqi-add-inspur-advantech-ids.patch
index b99e1a477..e04ebcaa7 100644
--- a/0001-scsi-smartpqi-add-inspur-advantech-ids.patch
+++ b/0001-scsi-smartpqi-add-inspur-advantech-ids.patch
@@ -32,10 +32,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 16 insertions(+)
 
 diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index ca1e6cf6a38e..af3ce8608ed3 100644
+index bd38c8cea56e..477eb841d4e5 100644
 --- a/drivers/scsi/smartpqi/smartpqi_init.c
 +++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -8250,6 +8250,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8251,6 +8251,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       0x19e5, 0xd22c)
  	},
@@ -54,7 +54,7 @@ index ca1e6cf6a38e..af3ce8608ed3 100644
  	{
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       PCI_VENDOR_ID_ADAPTEC2, 0x0110)
-@@ -8386,6 +8398,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8387,6 +8399,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       PCI_VENDOR_ID_ADVANTECH, 0x8312)
  	},
diff --git a/0001-tags.sh-Ignore-redhat-rpm.patch b/0001-tags.sh-Ignore-redhat-rpm.patch
index 1adc19ae0..089afa74b 100644
--- a/0001-tags.sh-Ignore-redhat-rpm.patch
+++ b/0001-tags.sh-Ignore-redhat-rpm.patch
@@ -37,7 +37,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/scripts/tags.sh b/scripts/tags.sh
-index 850f4ccb6afc..64154c5fc10c 100755
+index 32d3f53af10b..52a0138c6920 100755
 --- a/scripts/tags.sh
 +++ b/scripts/tags.sh
 @@ -16,6 +16,8 @@ fi
diff --git a/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch b/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch
new file mode 100644
index 000000000..49dadd91a
--- /dev/null
+++ b/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch
@@ -0,0 +1,60 @@
+From 746f534a4809e07f427f7d13d10f3a6a9641e5c3 Mon Sep 17 00:00:00 2001
+From: Tony Ambardar <tony.ambardar@gmail.com>
+Date: Sat, 5 Sep 2020 14:48:31 -0700
+Subject: [PATCH] tools/libbpf: Avoid counting local symbols in ABI check
+
+Ignore the below, we are actually reverting this patch for now
+
+Encountered the following failure building libbpf from kernel 5.8.5 sources
+with GCC 8.4.0 and binutils 2.34: (long paths shortened)
+
+Investigation shows _fini and _init are actually local symbols counted
+amongst global ones:
+
+  $ readelf --dyn-syms --wide libbpf.so|head -10
+
+  Symbol table '.dynsym' contains 343 entries:
+     Num:    Value  Size Type    Bind   Vis      Ndx Name
+       0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND
+       1: 00004098     0 SECTION LOCAL  DEFAULT   11
+       2: 00004098     8 FUNC    LOCAL  DEFAULT   11 _init@@LIBBPF_0.0.1
+       3: 00023040     8 FUNC    LOCAL  DEFAULT   14 _fini@@LIBBPF_0.0.1
+       4: 00000000     0 OBJECT  GLOBAL DEFAULT  ABS LIBBPF_0.0.4
+       5: 00000000     0 OBJECT  GLOBAL DEFAULT  ABS LIBBPF_0.0.1
+       6: 0000ffa4     8 FUNC    GLOBAL DEFAULT   12 bpf_object__find_map_by_offset@@LIBBPF_0.0.1
+
+A previous commit filtered global symbols in sharedobjs/libbpf-in.o. Do the
+same with the libbpf.so DSO for consistent comparison.
+
+Fixes: 306b267cb3c4 ("libbpf: Verify versioned symbols")
+Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
+Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+Acked-by: Andrii Nakryiko <andriin@fb.com>
+Link: https://lore.kernel.org/bpf/20200905214831.1565465-1-Tony.Ambardar@gmail.com
+---
+ tools/lib/bpf/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
+index b78484e7a608..9ae8f4ef0aac 100644
+--- a/tools/lib/bpf/Makefile
++++ b/tools/lib/bpf/Makefile
+@@ -152,7 +152,6 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \
+ 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
+ 			   sort -u | wc -l)
+ VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \
+-			      awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
+ 			      grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)
+
+ CMD_TARGETS = $(LIB_TARGET) $(PC_FILE)
+@@ -219,7 +220,6 @@ check_abi: $(OUTPUT)libbpf.so
+ 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
+ 		    sort -u > $(OUTPUT)libbpf_global_syms.tmp;		 \
+ 		readelf --dyn-syms --wide $(OUTPUT)libbpf.so |		 \
+-		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
+ 		    grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 |		 \
+ 		    sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; 	 \
+ 		diff -u $(OUTPUT)libbpf_global_syms.tmp			 \
+-- 
+2.28.0
+
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 07fdee057..b2504df4a 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 20
+RHEL_RELEASE = 22
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 114c8e952..76d3b2f2f 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,75 +1,75 @@
-d050d59df54ae511abe2749da224fdead503d8eb Filter out LTO build options from the perl ccopts
-ac45397de18ae12a593d9905f45184653778c12c Temporarily remove cdomain from sphinx documentation
-640592428861a423ff76e010ac94c0534604824b Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
-c15af43ddd7d41b4057d0a5b024106ebde0c1638 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only
-c189dfd915d3491c25af95f37b9607cb23d8d408 arch/x86: Remove vendor specific CPU ID checks
-5f3e99d5ea1148a4f116ad25c04755a17ed97d8c redhat: Replace hardware.redhat.com link in Unsupported message
-844d4ff20ee79a738e70186daa6d7fa410d3c9fa x86: Fix compile issues with rh_check_supported()
-8065d66d3d7945d3e764187dbea84f02a8ded75a e1000e: bump up timeout to wait when ME un-configure ULP mode
-8714692ff7c4d29ea19559163f35fa8010bc3a6e drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation
-19b41705110cac0669c07afe12ad111af9ec8ee3 drm: panel: add Xingbangda XBD599 panel
-c6b2c9e3ce1040cb8118cec45475f172a5500399 dt-bindings: panel: add binding for Xingbangda XBD599 panel
-3b3965f1f690e8b6f822d1595c58b2e642cd75cd ARM: fix __get_user_check() in case uaccess_* calls are not inlined
-fe8f04e184269f114b54019da0219fb700c30180 mm/kmemleak: skip late_init if not skip disable
-b3b4264f1c86243abdf152ac3f9fdf9179334f91 KEYS: Make use of platform keyring for module signature verify
-1786643603f8f2764b284883bafff969a5ccbf47 Drop that for now
-3d21988c3fc938c129d11f27305b9204a960d45f Input: rmi4 - remove the need for artificial IRQ in case of HID
-96d54983c9e35cb1b6db02696c3f93d174521b4e ARM: tegra: usb no reset
-7fed090d9758059dc81133eabaf431be489d7bac arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
-70c0c26b9077fbd9fcbe4b7e15b25d8ed2e4a4fc redhat: rh_kabi: deduplication friendly structs
-954c348127aa0a6d9daa8458e06bce6aeab93ac7 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
-8886c73e2b745096d20c3c60dc61da25d3f92238 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-16df75e4a82d6a4049a285bd35fc7893334ea728 redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-07cff8a43d87f3f4fd6c947a8dbb03629dec7f1b redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
-4cd2c3ac05c76f23a81e8321aad4f711da73e3b6 redhat: rh_kabi: Add macros to size and extend structs
-e7ae8fe482c3f6fdb9f4982e60756ebdc4a706cf Removing Obsolete hba pci-ids from rhel8
-12db34ebe175f7eccddfa7ab10def6bee5e604e1 mptsas: pci-id table changes
-3ef11f1dda218250c91ceebea7e11cd406e4e2d9 mptsas: Taint kernel if mptsas is loaded
-1c75f07f03eee584c99fdb6dc795ca88352aae7b mptspi: pci-id table changes
-08004f7e34bb7d82a49ddeac329fa229dccbeef3 qla2xxx: Remove PCI IDs of deprecated adapter
-e0644bfe2c8da1906ff026b4e5a6c9f6b42a413d be2iscsi: remove unsupported device IDs
-35e989810007a0b154373119ac89a1ecfbebeb15 mptspi: Taint kernel if mptspi is loaded
-b06ab2b263e08ee644e9bc655a5e401e175060b7 hpsa: remove old cciss-based smartarray pci ids
-52423cd02aee7419d201c9181be35a35cbdb0940 qla4xxx: Remove deprecated PCI IDs from RHEL 8
-07ee8a0a019860c0f4394d624eb73d92e2c83137 aacraid: Remove depreciated device and vendor PCI id's
-752d49d3cc795cb108d0324277eb601580cc3f80 megaraid_sas: remove deprecated pci-ids
-8fb0c76365e46b6aa085a12bd803b5b80c189206 mpt*: remove certain deprecated pci-ids
-f30105994c63b739c229a0583291b988435add80 kernel: add SUPPORT_REMOVED kernel taint
-fcefa27f17c1dd32f7a470f9ddae5a58578eb3fd Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-7995321a6b571e93ed4f6db74ea58503ede740c8 Add option of 13 for FORCE_MAX_ZONEORDER
-64b6406ab965d13d31bdb1dcbb0d6b156bb22432 s390: Lock down the kernel when the IPL secure flag is set
-e2dff8da82a7c54ae73235f12c9fd30815064395 efi: Lock down the kernel if booted in secure boot mode
-51f5608f135bbdfb91820878cf01e81e0973aaec efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
-e1fad39b73243babed5a594ee51e466e7dcfc383 security: lockdown: expose a hook to lock the kernel down
-473a2d149faeff9f58445c9f6f6fb7672d511f29 Make get_cert_list() use efi_status_to_str() to print error messages.
-b35fa09721d651880eee5e7a080494d77b6497ee Add efi_status_to_str() and rework efi_status_to_err().
-bab88142be87711ce284954571c43cd82456e6ee Add support for deprecating processors
-65458b4ce50e2fba43ac9265775347a7cee84b92 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
-bc75a2a1f2d729595ce2f0297e6f15f139a80b06 iommu/arm-smmu: workaround DMA mode issues
-a0848af208965c3dfc0088695ffb5ff8bf3b8bcc rh_kabi: introduce RH_KABI_EXCLUDE
-4e1eeb20578912d3e4e22ce09332a7b61537f87f ipmi: do not configure ipmi for HPE m400
-6a0b92eed96ba7eae2552301b65ef69243a2b7b0 IB/rxe: Mark Soft-RoCE Transport driver as tech-preview
-c0708650e75b643818b38693ecd6d5ed0d5bc7c6 scsi: smartpqi: add inspur advantech ids
-8dc0bc473e1012c0e660359c5a4fa277b76c1673 ice: mark driver as tech-preview
-4936bf80b84807b47cda3c77ef0218c99ea937c6 kABI: Add generic kABI macros to use for kABI workarounds
-7086fb873e5507079c92b78c474cdc4ed4e1a56d add pci_hw_vendor_status()
-27f4611163cea50a706e3a151ed002fb87f800a0 ahci: thunderx2: Fix for errata that affects stop engine
-7af030958933c4b107fcffa4e5b9cf87f17c92bd Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
-d5a6b43b0a2c141b05c99e94fbeff95e6ffed98e bpf: Add tech preview taint for syscall
-8c5af605b98ababb4e8498b83666ca4efec49ac7 bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-bc0745a1bbeb715866b885cb48c807b9184ce651 add Red Hat-specific taint flags
-399fb032c09f96b6b2c183edf7dd9ed883940cbd kdump: fix a grammar issue in a kernel message
-f15181481f999316e5f638f455aa327ad778004f tags.sh: Ignore redhat/rpm
-dffb37699813e29c2e2f4f1f14cf8450f4488f48 put RHEL info into generated headers
-35cc3773d5bf853ebe6fbefaee74bc7f58c5c91f kdump: add support for crashkernel=auto
-5d7a4d4ff5c755cb747f9d3af86ad182ceeea05e kdump: round up the total memory size to 128M for crashkernel reservation
-c750840bb23a14c00fd6e5e9c503c5cbaca2f55a acpi: prefer booting with ACPI over DTS
-1eb76f4018166a2d2d4f8b643936154c1408af4a aarch64: acpi scan: Fix regression related to X-Gene UARTs
-1fdff94dd0be0fdee5b57830ca2e8225ad46507b ACPI / irq: Workaround firmware issue on X-Gene based m400
-2bb817df21bfb67a0f586a9d848b41655d6624e3 modules: add rhelversion MODULE_INFO tag
-e4d3e12560c5747bdce3d8a350f5f04da38425fc ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
-76c6bf67413f363c6941327a9b4bf2bdacd07868 Add Red Hat tainting
-379f6759a865681f716334965b7605feea26e738 Introduce CONFIG_RH_DISABLE_DEPRECATED
+144ad28edaae462b1189129b54a5db77edf96cc2 Filter out LTO build options from the perl ccopts
+51a53c1410eff7896c82979e89f8c50f12e65b07 Temporarily remove cdomain from sphinx documentation
+4cc03e14217a557cbbd29b6457ebd178a3ef1006 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
+17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only
+e7c009cd91ababdbb5f726ef592c7800f0682d3a arch/x86: Remove vendor specific CPU ID checks
+7120b2a26fc4c7954fd0395973dc6739c110e091 redhat: Replace hardware.redhat.com link in Unsupported message
+7a28e2fde653a161913abb8eee943cdacb5ff2ae x86: Fix compile issues with rh_check_supported()
+45f64c1a24e73af7987cffec3ea941e29364f87f e1000e: bump up timeout to wait when ME un-configure ULP mode
+6c14763b1ce98698949ff45135c15e333aa6416d drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation
+67a19b16012b12cffba0b515c6503e5f8cdbb798 drm: panel: add Xingbangda XBD599 panel
+d220dbf98cef820367b5a2a2eeaacebee958bdd4 dt-bindings: panel: add binding for Xingbangda XBD599 panel
+80660062260dec4bdca9540922577542c16145e8 ARM: fix __get_user_check() in case uaccess_* calls are not inlined
+24d8743613b2a6a585fc68cfe95078d9a3d5b389 mm/kmemleak: skip late_init if not skip disable
+b697ff5e26974fee8fcd31a1e221e9dd41515efc KEYS: Make use of platform keyring for module signature verify
+081d2185e22479b449586c4e9843602ca0d49806 Drop that for now
+5ef51389cf6673a0e9e004909c7be1dc785050b2 Input: rmi4 - remove the need for artificial IRQ in case of HID
+c1788012ebf8de46e9dc80d18051ed0c77c811b6 ARM: tegra: usb no reset
+577365feaa909db4c0949eabfcda7e4a972b8e54 arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
+331be9c5a436057ee852075c102d9d90a9046a30 redhat: rh_kabi: deduplication friendly structs
+34d79fbfb327f732ebf3ece4db21a14f81fedf03 redhat: rh_kabi add a comment with warning about RH_KABI_EXCLUDE usage
+93a4b5f12d5a1c2d62cf1d7c440b31d9847eab07 redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
+8e5c06356457f5351289e9f687b991189d163dae redhat: rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
+212cbccda77cc81fcb60123907eabdac8ad5adb7 redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference operator
+6f7744b412e1fb86a67d8761e64df69cf891b4ad redhat: rh_kabi: Add macros to size and extend structs
+049623d33998be30d79692c69b34acb502c496e3 Removing Obsolete hba pci-ids from rhel8
+43ef1d631ecfe84084db3572c9ed1bedbdceb0f8 mptsas: pci-id table changes
+e5726695109dd1a73da92487b75de6a51d54c015 mptsas: Taint kernel if mptsas is loaded
+ee4dcd6f04ca76ad35ab0f38c436ab2f7de53f16 mptspi: pci-id table changes
+bd305f716d8b64be1926bc7aebe02468ac6bf599 qla2xxx: Remove PCI IDs of deprecated adapter
+803ff9a2c660c094e14d246ef05019bf6008d503 be2iscsi: remove unsupported device IDs
+2cb24399321f555f18b0804d3fe02cf53949fba1 mptspi: Taint kernel if mptspi is loaded
+ad1740551ff4af49f1ef10a130783d9369e955a0 hpsa: remove old cciss-based smartarray pci ids
+4197ba3e766656eea9175c11ed05903620d98a28 qla4xxx: Remove deprecated PCI IDs from RHEL 8
+7e285aec22ab1213639afda877902db363473cb0 aacraid: Remove depreciated device and vendor PCI id's
+846109a16be92155e69731c36dde48761d375153 megaraid_sas: remove deprecated pci-ids
+6fd2019d01cee7ff36dc047d3ecdb504b968f222 mpt*: remove certain deprecated pci-ids
+dddcd5c1129b275ff160324036a662739db51fc3 kernel: add SUPPORT_REMOVED kernel taint
+08d77161dba915d1ed0d9fede658085440ab4474 Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
+e2dc2ca6a25a445bf22ceb6a8e38e02706605341 Add option of 13 for FORCE_MAX_ZONEORDER
+2384646bf71d8c282cf49bb20321fdf802c61cce s390: Lock down the kernel when the IPL secure flag is set
+5850c93175b9d2e1081873f4bbe08dead202cb08 efi: Lock down the kernel if booted in secure boot mode
+53250b991f841be025fa4d264850dadc0fae2861 efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
+72223fd1241cc5c70b96a491db14d54c83beadd8 security: lockdown: expose a hook to lock the kernel down
+7ba28f03674fa9346610c3fea7fc93bc58f06d2a Make get_cert_list() use efi_status_to_str() to print error messages.
+2ae9082db0b54d831a9b3782c049d9917e37d89f Add efi_status_to_str() and rework efi_status_to_err().
+cee1461ada1b7e4b92cd154e7ec241119afcd644 Add support for deprecating processors
+2420149f8f5fa9dd1e2dc793765b498022922a81 arm: aarch64: Drop the EXPERT setting from ARM64_FORCE_52BIT
+1d69b30b98b60aff639351f5788d20a3b17f6e27 iommu/arm-smmu: workaround DMA mode issues
+6b2e73e508e7a117b1db91596097c00e5570f64a rh_kabi: introduce RH_KABI_EXCLUDE
+ecb9206bce179eb600c52642a6753012a69ce4a2 ipmi: do not configure ipmi for HPE m400
+473be59fe72afa9969cf8d10609ef3f14f594631 IB/rxe: Mark Soft-RoCE Transport driver as tech-preview
+b94117795261f9c074a7addca2252238871b5081 scsi: smartpqi: add inspur advantech ids
+cae871558c333880c1687cab6f2a71accf40d105 ice: mark driver as tech-preview
+7d9cb007404211ea6638bde4a28dd0fbe8d95de0 kABI: Add generic kABI macros to use for kABI workarounds
+bd353e9aae8877dd490e6c92b67849e0dcfbab25 add pci_hw_vendor_status()
+41a259999969bbdfe9f556ce71f2c3c07d7454f4 ahci: thunderx2: Fix for errata that affects stop engine
+2a107343529ce648c11bff62e9f72bbeec738f3f Vulcan: AHCI PCI bar fix for Broadcom Vulcan early silicon
+03e48a48f400a51a182a1254cf22ff0c08706d76 bpf: Add tech preview taint for syscall
+607f0e89af7ef5682f79f2eea0a99638a1bc0c4f bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
+31da227877eb734ddb484bc519aae85ce200802e add Red Hat-specific taint flags
+7a2e2c83be0230667756cccb5bc3687419dfbb8b kdump: fix a grammar issue in a kernel message
+d345d54d33e7d496c9d845e4723550dd37cb3f88 tags.sh: Ignore redhat/rpm
+5c67dc1eb0783a5c4ca4eb5c545ff6fe05facff0 put RHEL info into generated headers
+ce12884c009ec3bed11100c9d19f6d97628cf8ae kdump: add support for crashkernel=auto
+18fb1389afccdc5535977a10669b49a37829b55a kdump: round up the total memory size to 128M for crashkernel reservation
+5fb9821441cc0b77101ad9c0dfaa747957a4cce4 acpi: prefer booting with ACPI over DTS
+0cf21a40db6fca5d89cf3d65808117c8c14e524e aarch64: acpi scan: Fix regression related to X-Gene UARTs
+de13e14cc2388478d9a2c68c5d90affd92098f11 ACPI / irq: Workaround firmware issue on X-Gene based m400
+71c098f4afa38a15a95495c14f71fb087ab27308 modules: add rhelversion MODULE_INFO tag
+3247f9c838f4aa91aa5d08c152b385d61554d4b5 ACPI: APEI: arm64: Ignore broken HPE moonshot APEI support
+e80982feaa68226ff60d2f83dace2016c35270d3 Add Red Hat tainting
+2987f9a606df106f5bdfa4113eb55356a21085a6 Introduce CONFIG_RH_DISABLE_DEPRECATED
 43557447afe99a0181e0f80e682a7cbdc03b4e7a gitattributes: Remove unnecesary export restrictions
 f003c79ead7f293e9315954c2c0fe39dda34459d Add RHMAINTAINERS file and supporting conf
 825b7aa1169c8a40f81b3b3a886a866ae80c3dc2 gitlab: Add CI job for packaging scripts
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 1c326064e..01575e706 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3026,7 +3026,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 2b0c4d3b6..ad4f3c928 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3010,7 +3010,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6bc1134ca..e8d6914be 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3064,7 +3064,7 @@ CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 # CONFIG_IR_RX51 is not set
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index b8fd440b1..ced912196 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3049,7 +3049,7 @@ CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 # CONFIG_IR_RX51 is not set
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index be689b2a5..5edbb3f60 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2996,7 +2996,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index b88ab1623..daf0176a3 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2981,7 +2981,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 04fd8a3e7..c8c430387 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2757,7 +2757,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 61b849812..8c8e6a309 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2740,7 +2740,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 8b4559439..50481fa57 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2496,7 +2496,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a3faad3bd..5cbce435f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2479,7 +2479,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 1f41814c0..586f2881b 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2472,7 +2472,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index e85c676b9..c0e4002b7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2455,7 +2455,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index cebeeb4c2..aaf42055c 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2805,7 +2805,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 0c78b7a63..33e97a528 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2788,7 +2788,7 @@ CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_RCMM_DECODER=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SANYO_DECODER=m
-# CONFIG_IR_SERIAL is not set
+CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
 CONFIG_IR_SHARP_DECODER=m
 # CONFIG_IR_SIR is not set
diff --git a/kernel.spec b/kernel.spec
index 87e250f36..2a06c5f1b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc7.20
+%global distro_build 0.rc7.20200930gitfb0155a09b02.22
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -71,13 +71,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.9.0
-%define pkgrelease 0.rc7.20
+%define pkgrelease 0.rc7.20200930gitfb0155a09b02.22
 
 # This is needed to do merge window version magic
 %define patchlevel 9
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20%{?buildid}%{?dist}
+%define specrelease 0.rc7.20200930gitfb0155a09b02.22%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -168,7 +168,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # The kernel tarball/base version
 %define kversion 5.9
@@ -184,10 +184,10 @@ Summary: The Linux kernel
 # no whitelist
 %define with_kernel_abi_whitelists 0
 # Fedora builds these separately
-%endif
 %define with_perf 0
 %define with_tools 0
 %define with_bpftool 0
+%endif
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -568,7 +568,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.9-rc7.tar.xz
+Source0: linux-20200930gitfb0155a09b02.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -792,6 +792,7 @@ Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
 Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
 Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
 Patch75: 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch
+Patch76: 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch
 
 %endif
 
@@ -1287,8 +1288,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.9-rc7 -c
-mv linux-5.9-rc7 linux-%{KVERREL}
+%setup -q -n kernel-20200930gitfb0155a09b02 -c
+mv linux-20200930gitfb0155a09b02 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -1369,6 +1370,7 @@ ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.pat
 ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
 ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
 ApplyOptionalPatch 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch
+ApplyOptionalPatch 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch
 
 %endif
 
@@ -2073,6 +2075,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
 %global perf_make \
   %{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3}
 %if %{with_perf}
+%global _lto_cflags %{nil}
 # perf
 # make sure check-headers.sh is executable
 chmod +x tools/perf/check-headers.sh
@@ -2787,6 +2790,20 @@ fi
 #
 #
 %changelog
+* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21]
+- Merge ark-patches
+
+* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.20.test]
+- fb0155a09b02 rebase
+
+* Tue Sep 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20]
+- Merge ark-patches
+
+* Tue Sep 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.19.test]
+- Separate merge-upstream and release stages (Don Zickus)
+- Re-enable CONFIG_IR_SERIAL on Fedora (Prarit Bhargava)
+- Updated changelog for the release based on v5.9-rc7 (Fedora Kernel Team)
+
 * Mon Sep 28 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.19]
 - Merge ark-patches
 
diff --git a/sources b/sources
index 9b7999ce0..6c574b383 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.9-rc7.tar.xz) = cd3ad94a6c2e60ccce7db1343dd6a7ae4f06de8426f22fb2cc6b693fe83f7b1c3825cb80bde353ebfc659debdea14b333546848828ebb971036356e3515d8616
-SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20.tar.bz2) = 4065f8f5f99f14f0e79e82843c8616ea44916b086804dd479291488d2bb5700623d13427c87501517d199739175f50163deb5bde93c2abe6d90d398f668968b8
-SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20.tar.bz2) = 25dc7a540a35b0787730c4b3261993afaeeed75855a92f33b673369c0b188092f57de4e94994eab8c739e581dc5279726c5d85c8ddbbb1d1480b1557b401c190
+SHA512 (linux-20200930gitfb0155a09b02.tar.xz) = 68c92ab5a2476e6fdc0263e264c5804e43a84dbc659a94e674d7306cd7ef03dd2d7cde8c194415320e80eba80953e0de93fc7275023f9540be5dd6c3ba5cbc99
+SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 8a5989f5488ecabb016fef35950ea48cc2f23a9e76bc2442a81f294c4827b9b8b944bbd98f8509ef3be2944ccb24fe94a2bb7a3b62642f905c9cd85006e90af0
+SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 13b209c5a0bb08fbff3a87679a9da502f185b600b792a626a1364ccabcb30acf5929ebb4c0314bfb81c0472f1fb741103a8da62319c7d2475927352db322b37e