From a08cf045fe05c05cb97e28efd2bd8166b5e89428 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 7 Dec 2020 10:28:00 -0600 Subject: kernel-5.10.0-0.rc7.93 * Mon Dec 07 2020 Fedora Kernel Team [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 --- patch-5.10.0-redhat.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'patch-5.10.0-redhat.patch') 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) -- cgit