kernel-5.10.0-0.rc7.20201209gita68a0262abda.95

* Wed Dec 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.20201209gita68a0262abda.95]
- Temporarily backout parallel xz script ("Justin M. Forbes")
- Remove cp instruction already handled in instruction below. ("Paulo E. Castro")
- Add all the dependencies gleaned from running `make prepare` on a bloated devel kernel. ("Paulo E. Castro")
- Add tools to path mangling script. ("Paulo E. Castro")
- Remove duplicate cp statement which is also not specific to x86. ("Paulo E. Castro")
- Correct orc_types failure whilst running `make prepare` https://bugzilla.redhat.com/show_bug.cgi?id=1882854 ("Paulo E. Castro")
- build_configs.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- genspec.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- ark-rebase-patches.sh: Fix for shellcheck (Ben Crocker)
- ark-create-release.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- merge-subtrees.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- rh-dist-git.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- update_scripts.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- x86_rngd.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- parallel_xz.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- expand_srpm.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- create-tarball.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- generate_bls_conf.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- clone_tree.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- new_release.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- download_cross.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- create_distgit_changelog.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- generate_cross_report.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- run_kabi-dw.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- mod-blacklist.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- scripts/configdiff.sh: Fix syntax flagged by shellcheck (Ben Crocker)
- self-test/0001-shellcheck.bats: check for shellcheck (Ben Crocker)
- self-test/1001-rpmlint.bats, 1003-rpminspect.bats (Ben Crocker)
- Makefile, Makefile.common, egit.sh, 1005-dist-dump-variables.bats (Ben Crocker)
- Add GIT macro to Makefile and Makefile.common: (Ben Crocker)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

25 files changed, 45 insertions, 40 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index a8d23f665..a6b858d9a 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 = 93
+RHEL_RELEASE = 95
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5e816f3e4..66a60609a 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
@@ -5676,7 +5676,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a90638e6e..459ba71c0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2166,7 +2166,7 @@ CONFIG_IMA=y
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f4b5c9be4..58ddc8cb3 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1440,7 +1440,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
@@ -5657,7 +5657,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index ec76e5459..213910612 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2150,7 +2150,7 @@ CONFIG_IMA=y
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index a3daae8c2..d6e8511d6 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -5810,7 +5810,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 54d09c071..fe5ff8d17 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -5792,7 +5792,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index e572b74ac..21a669f59 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -5627,7 +5627,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 65a980743..a51a51a72 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -5609,7 +5609,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index dc3fccd9d..1c85d7020 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5088,7 +5088,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 0e988ca1e..6e6ddbef2 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5069,7 +5069,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index cad0302e4..fc98f141d 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4763,7 +4763,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 206c96674..b1f4b0eb9 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2033,7 +2033,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index aafeabd5a..6dd56b961 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4743,7 +4743,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 7fb7315b5..30779f41c 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2017,7 +2017,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 0a509bbdf..bc255f141 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2009,7 +2009,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index ec0973b33..943f22eac 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1993,7 +1993,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index dbd5f14b3..b0fd378fa 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2008,7 +2008,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 9eef5a9d3..2ab9c6357 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3048,7 +3048,6 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
 # CONFIG_KS8851_MLL is not set
-# CONFIG_KCSAN is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
 # CONFIG_KUNIT is not set
@@ -5132,7 +5131,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 309033c2f..1ec3ea3d1 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2168,7 +2168,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 8ecfad2f5..a10f1bbc4 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -3029,7 +3029,6 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
 # CONFIG_KS8851_MLL is not set
-# CONFIG_KCSAN is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
 # CONFIG_KUNIT is not set
@@ -5113,7 +5112,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
-# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_NVMEM=y
 # CONFIG_RTC_SYSTOHC is not set
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_RTL8180=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index f05bdab18..31e2b4d88 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2152,7 +2152,7 @@ CONFIG_IMA=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
-# CONFIG_INET6_ESPINTCP is not set
+CONFIG_INET6_ESPINTCP=y
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
diff --git a/kernel.spec b/kernel.spec
index e25f44f46..6ea2fd48d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc7.93
+%global distro_build 0.rc7.20201209gita68a0262abda.95
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -97,13 +97,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.10.0
-%define pkgrelease 0.rc7.93
+%define pkgrelease 0.rc7.20201209gita68a0262abda.95
 
 # This is needed to do merge window version magic
 %define patchlevel 10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.93%{?buildid}%{?dist}
+%define specrelease 0.rc7.20201209gita68a0262abda.95%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -193,7 +193,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.10
@@ -590,7 +590,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.10-rc7.tar.xz
+Source0: linux-20201209gita68a0262abda.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1235,8 +1235,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.10-rc7 -c
-mv linux-5.10-rc7 linux-%{KVERREL}
+%setup -q -n kernel-20201209gita68a0262abda -c
+mv linux-20201209gita68a0262abda linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2725,7 +2725,7 @@ fi
 #
 #
 %changelog
-* Mon Dec 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.93]
+* Wed Dec 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.20201209gita68a0262abda.95]
 - Temporarily backout parallel xz script ("Justin M. Forbes")
 - Remove cp instruction already handled in instruction below. ("Paulo E. Castro")
 - Add all the dependencies gleaned from running `make prepare` on a bloated devel kernel. ("Paulo E. Castro")
@@ -2757,6 +2757,13 @@ fi
 - Makefile, Makefile.common, egit.sh, 1005-dist-dump-variables.bats (Ben Crocker)
 - Add GIT macro to Makefile and Makefile.common: (Ben Crocker)
 
+* Wed Dec 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.20201209gita68a0262abda.94]
+- Update CONFIG_INET6_ESPINTCP (Justin Forbes)
+- New configs in net/ipv6 ("Justin M. Forbes")
+
+* Tue Dec 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.93]
+- fedora: move CONFIG_RTC_NVMEM options from ark to common (Peter Robinson)
+
 * Mon Dec 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.92]
 - configs: Enable CONFIG_DEBUG_INFO_BTF (Don Zickus)
 
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch
index 71bed1c5d..a71a191bf 100644
--- a/patch-5.10.0-redhat.patch
+++ b/patch-5.10.0-redhat.patch
@@ -1984,10 +1984,10 @@ index d48414e295a0..ba0e384412c9 100644
  		PCI_ANY_ID, PCI_ANY_ID, },
  	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
 diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 41cd66fc7d81..2bc149710f3d 100644
+index e158d3d62056..f63c55b6408c 100644
 --- a/drivers/scsi/megaraid/megaraid_sas_base.c
 +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -138,6 +138,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
+@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
   */
  static struct pci_device_id megasas_pci_table[] = {
 
@@ -1995,7 +1995,7 @@ index 41cd66fc7d81..2bc149710f3d 100644
  	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
  	/* xscale IOP */
  	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
-@@ -156,6 +157,7 @@ static struct pci_device_id megasas_pci_table[] = {
+@@ -151,6 +152,7 @@ static struct pci_device_id megasas_pci_table[] = {
  	/* xscale IOP, vega */
  	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
  	/* xscale IOP */
diff --git a/sources b/sources
index f4ebe11cb..2a8ea1226 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.10-rc7.tar.xz) = feddb69fe36524a845a2ff554bdf1d2da599a3bbe4cb0533773c6cbd5a8859cfc402600242d4b5a7aa8a88246a9da4f2a894eca79eecd0c452dbf12a4ff5fde7
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc7.93.tar.bz2) = 74aff43bb55f0c1ff44baaa2e1f058038e367ed2dc370e22b7ddee0232c24a883dc3cbe4bbc37b52559cba4b84d8d60d6c46a8812ba7ec92817dc2d272f5533c
-SHA512 (kernel-kabi-dw-5.10.0-0.rc7.93.tar.bz2) = f4298dece9994ecf46dd4ac70d9c9f9e117f0434fd37e5f1813371e45bf83ca4e31273d88cc5be94817fe51f6626b35897ba31f05de65a36e80264e2b521a64a
+SHA512 (linux-20201209gita68a0262abda.tar.xz) = 7a47f8587a51db41dcbbb1f0db89744df69cdd7518a447c4674b3e1c14cd4bd171c48784b80eb16f0cb6b0cbfea92439daced287f10203c4763e5f2a0cef9824
+SHA512 (kernel-abi-whitelists-5.10.0-0.rc7.20201209gita68a0262abda.95.tar.bz2) = a6a4ac99cb5ecb69d0a193e27eb04e06647f216cde6f993e8683a33f52387e1549612f93607bf5be6a54eab88966dd0a36cbd871d3ac7ef050513cd37ea9878f
+SHA512 (kernel-kabi-dw-5.10.0-0.rc7.20201209gita68a0262abda.95.tar.bz2) = f05e0ffedbe6945f6297019eb790042d0e6e70adae0fbe663c7e8b3a36c5db9c8d37de2ec326732960127a197979f70f568f8273b31cc8916b01fd6dcf35553e