summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-05 17:08:36 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-05 17:08:36 +0200
commit3bb63fa7872e911bdf13d1822719f83310fab24d (patch)
tree16cda2d87b087bb35eca65fffed9df1f7e1f9335
parent26eb46adb81a7aad4536e803cbb8b937d1e4d135 (diff)
parentc918bd768aa916cb376b54354b0753903a1a18b5 (diff)
downloadkernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.gz
kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.xz
kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.zip
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config3
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config3
-rwxr-xr-xkernel.spec12
-rw-r--r--patch-5.12.0-redhat.patch10
-rw-r--r--sources6
25 files changed, 17 insertions, 43 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index ccd4890d5..b8928bb39 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 = 181
+RHEL_RELEASE = 184
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 22aaff5fa..995ae3956 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -6474,7 +6474,6 @@ CONFIG_WQ_WATCHDOG=y
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 08a178f10..3471acc1a 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -6450,7 +6450,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6b9d77ec4..edd42c4af 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -326,7 +326,6 @@ CONFIG_ARCH_ZYNQ=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 9435a1e66..fd2f2d6f7 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -326,7 +326,6 @@ CONFIG_ARCH_ZYNQ=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 42546b261..13df7fe36 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -318,7 +318,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 858d06a7a..859eeef20 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -318,7 +318,6 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 855767444..c596786da 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -273,7 +273,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 64d706c31..aa41826c4 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -273,7 +273,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ce89bcfb0..4c096b3e5 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -237,7 +237,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index e0d76c31a..b3e2e68f7 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6290,7 +6289,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 190466b90..06c606b43 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -237,7 +237,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 4438ccc29..ecae9d604 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6271,7 +6270,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index b5a856330..f6c5b191c 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -241,7 +241,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 8570a0b9a..2d1234e8b 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6244,7 +6243,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 8f74a3d6a..29581177a 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -241,7 +241,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index cbfac0e68..baee453e0 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6225,7 +6224,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index a84ccab20..1e0904e18 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6261,7 +6260,6 @@ CONFIG_WMI_BMOF=m
# CONFIG_X25 is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a818f3444..63c3fb042 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -275,7 +275,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 1d24d40e9..032151535 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -224,7 +224,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6549,7 +6548,7 @@ CONFIG_X86_PAT=y
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_PKG_TEMP_THERMAL=m
CONFIG_X86_PLATFORM_DEVICES=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_X86_PM_TIMER=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e68a7ba67..726c16959 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -275,7 +275,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 1f40cc183..efffd6687 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -224,7 +224,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCNET is not set
CONFIG_ARM64_AMU_EXTN=y
-CONFIG_ARM64_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
@@ -6527,7 +6526,7 @@ CONFIG_X86_PAT=y
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_PKG_TEMP_THERMAL=m
CONFIG_X86_PLATFORM_DEVICES=y
-# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_X86_PM_TIMER=y
diff --git a/kernel.spec b/kernel.spec
index 4c158a715..8bb311b31 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc5.20210331git2bb25b3a748a.181
+%global distro_build 0.rc6.184
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -109,13 +109,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.12.0
-%define pkgrelease 0.rc5.20210331git2bb25b3a748a.181
+%define pkgrelease 0.rc6.184
# This is needed to do merge window version magic
%define patchlevel 12
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20210331git2bb25b3a748a.181%{?buildid}%{?dist}
+%define specrelease 0.rc6.184%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -622,7 +622,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210331git2bb25b3a748a.tar.xz
+Source0: linux-5.12-rc6.tar.xz
Source1: Makefile.rhelver
@@ -1277,8 +1277,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20210331git2bb25b3a748a -c
-mv linux-20210331git2bb25b3a748a linux-%{KVERREL}
+%setup -q -n kernel-5.12-rc6 -c
+mv linux-5.12-rc6 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index 7df19e84b..020348cfc 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -138,7 +138,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 73add16f9898..892e60ae6d18 100644
+index cc77fd45ca64..c60efba564da 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -288,7 +288,7 @@ index ab640abe26b6..dad705387133 100644
setup_force_cpu_cap(X86_FEATURE_CPUID);
cpu_parse_early_param();
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d883176ef2ce..5abf76890d93 100644
+index 5ecd69a48393..36549c6170bf 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -18,6 +18,7 @@
@@ -374,7 +374,7 @@ index d883176ef2ce..5abf76890d93 100644
dmi_setup();
/*
-@@ -1112,19 +1165,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1115,19 +1168,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -395,7 +395,7 @@ index d883176ef2ce..5abf76890d93 100644
reserve_initrd();
-@@ -1232,6 +1273,8 @@ void __init setup_arch(char **cmdline_p)
+@@ -1230,6 +1271,8 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif
@@ -467,7 +467,7 @@ index e209081d644b..7484bcf59a1b 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 84bb7c1929f1..2e588a4178ef 100644
+index 6efe7edd7b1e..603f912b7743 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1639,6 +1639,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
diff --git a/sources b/sources
index 1ca1837a0..18ce5db00 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210331git2bb25b3a748a.tar.xz) = a9ecb1daae66ab703e9d2030be7158855bcfb25a31bbda5ee90b30819e6125d4c1dd6d037a697db123f4bc8a842e05144484254d75c51036e25df294459fd120
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc5.20210331git2bb25b3a748a.181.tar.bz2) = 4496ff5c4d0d1b9528844ddc8769a86a8d2f41f96f442b826d5b36712970f8147c2be20bd1f36666b20256b03f83e2ba40b551aa0ff3bdcadb763a811d7f5f4b
-SHA512 (kernel-kabi-dw-5.12.0-0.rc5.20210331git2bb25b3a748a.181.tar.bz2) = cc0ba4830a2ea84221666ed439c40085f3804ea0f0d5502d5dbcbcb360beb1fa31b9619213f3758133df6bf1a1664383c92d98fcbacd7be063e4ae0878081408
+SHA512 (linux-5.12-rc6.tar.xz) = f33b8e96aad6b415f4ccafff027725e872039eec4985c6223a51b80da42297ae7ea5325cf4e9bc1a3c17fbdb943ea43760e1674d94f4a51699b8848f0d031363
+SHA512 (kernel-abi-whitelists-5.12.0-0.rc6.184.tar.bz2) = 36a5eb676375f8fc1cf78f36ed0084955b4297409817eda8f3fea4052502d1d732ee9752067b5616f1a00f47402eb3fc207ca53cc6ca14a7196460e0834fe1bf
+SHA512 (kernel-kabi-dw-5.12.0-0.rc6.184.tar.bz2) = ad9953764e8023b640906bd5f1a9cd14f135f0d960b1e41a7bd80e2d1fc7832585da17ac6a5f8d9aa3a14a6845af63ae161d65aa18f998ec9d59b05388f42e78