kernel-5.10.0-0.rc7.93

* Mon Dec 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.93]
- 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>

13 files changed, 31 insertions, 29 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 3962b0c1f..a8d23f665 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 = 92
+RHEL_RELEASE = 93
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index b5cb06211..a90638e6e 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -384,7 +384,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 981bbc922..ec76e5459 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -384,7 +384,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 2559d4a31..206c96674 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -281,7 +281,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 88fbd31d9..7fb7315b5 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -281,7 +281,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index f23554800..0a509bbdf 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -281,7 +281,7 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index eb4142139..ec0973b33 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -281,7 +281,7 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index e447c3568..dbd5f14b3 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -283,7 +283,7 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 23adce413..309033c2f 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -317,7 +317,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 77aef7619..f05bdab18 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -317,7 +317,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_KTD253 is not set
-# CONFIG_BACKLIGHT_LED is not set
+CONFIG_BACKLIGHT_LED=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
diff --git a/kernel.spec b/kernel.spec
index 45b361c09..5050f7250 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.rc6.20201204git34816d20f173.92
+%global distro_build 0.rc7.93
 
 %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.rc6.20201204git34816d20f173.92
+%define pkgrelease 0.rc7.93
 
 # This is needed to do merge window version magic
 %define patchlevel 10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20201204git34816d20f173.92%{?buildid}%{?dist}
+%define specrelease 0.rc7.93%{?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 0
+%define debugbuildsenabled 1
 
 # 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-20201204git34816d20f173.tar.xz
+Source0: linux-5.10-rc7.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1234,8 +1234,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20201204git34816d20f173 -c
-mv linux-20201204git34816d20f173 linux-%{KVERREL}
+%setup -q -n kernel-5.10-rc7 -c
+mv linux-5.10-rc7 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2723,8 +2723,7 @@ fi
 #
 #
 %changelog
-* Fri Dec 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc6.20201204git34816d20f173.92]
-- configs: Enable CONFIG_DEBUG_INFO_BTF (Don Zickus)
+* Mon Dec 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc7.93]
 - 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")
@@ -2756,6 +2755,9 @@ fi
 - Makefile, Makefile.common, egit.sh, 1005-dist-dump-variables.bats (Ben Crocker)
 - Add GIT macro to Makefile and Makefile.common: (Ben Crocker)
 
+* 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)
+
 * Thu Dec 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc6.20201203git34816d20f173.91]
 - fedora: some minor arm audio config tweaks (Peter Robinson)
 - Ship xpad with default modules on Fedora and RHEL (Bastien Nocera)
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch
index 1ef9802e7..71bed1c5d 100644
--- a/patch-5.10.0-redhat.patch
+++ b/patch-5.10.0-redhat.patch
@@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 43ecedeb3f02..d35dda518ef1 100644
+index 9ec53d947628..43dc30764eda 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -224,7 +224,7 @@ index 43ecedeb3f02..d35dda518ef1 100644
  		   -Werror=return-type -Wno-format-security \
  		   -std=gnu89
  KBUILD_CPPFLAGS := -D__KERNEL__
-@@ -1245,7 +1250,13 @@ endef
+@@ -1253,7 +1258,13 @@ endef
  define filechk_version.h
  	echo \#define LINUX_VERSION_CODE $(shell                         \
  	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
@@ -240,10 +240,10 @@ index 43ecedeb3f02..d35dda518ef1 100644
 
  $(version_h): FORCE
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index fe2f17eb2b50..5bbcac6318a9 100644
+index 002e0cf025f5..0bd19ef73eec 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1513,9 +1513,9 @@ config HIGHMEM
+@@ -1514,9 +1514,9 @@ config HIGHMEM
  	  If unsure, say n.
 
  config HIGHPTE
@@ -287,10 +287,10 @@ index a13d90206472..6a6aae01755b 100644
 
  #define get_user(x, p)							\
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 1515f6f153a0..b79d18fcd698 100644
+index a6b5b7ef40ae..6632e57859f5 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -891,7 +891,7 @@ endchoice
+@@ -892,7 +892,7 @@ endchoice
 
  config ARM64_FORCE_52BIT
  	bool "Force 52-bit virtual addresses for userspace"
@@ -299,7 +299,7 @@ index 1515f6f153a0..b79d18fcd698 100644
  	help
  	  For systems with 52-bit userspace VAs enabled, the kernel will attempt
  	  to maintain compatibility with older software by providing 48-bit VAs
-@@ -1150,6 +1150,7 @@ config XEN
+@@ -1151,6 +1151,7 @@ config XEN
  config FORCE_MAX_ZONEORDER
  	int
  	default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)
diff --git a/sources b/sources
index bb6cf4b3b..f4ebe11cb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20201204git34816d20f173.tar.xz) = e7fdfe15c95f4ba3895c54fa2c5370a3508a4891540d1b5f6fe639bc5987e9836e525693c8258c478fda69abc7c979c4a8ce58a99b409cbffa70002f00251e02
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc6.20201204git34816d20f173.92.tar.bz2) = 909ca05fb63f100791dbb6651107d1951b1d34c83516d955ff8edfa3c583f7085aba23a35f629ce7dc655a4ef64cafacce5879a980e5430a0625da9e5df47940
-SHA512 (kernel-kabi-dw-5.10.0-0.rc6.20201204git34816d20f173.92.tar.bz2) = b89651bbb86fbfe0f2c5116df3f9ba60c6302a513400a43f1f30fa87aade7fca41e7cdd1c95eee16e88dd47d9c245fcde8e98277002a9195e84b95c3c79fdc7c
+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