Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc5.180.vanilla.1.fc35kernel-5.12.0-0.rc5.180.vanilla.1.fc34kernel-5.12.0-0.rc5.180.vanilla.1.fc33kernel-5.12.0-0.rc5.180.vanilla.1.fc32

22 files changed, 31 insertions, 17 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index f7cbe41db..e42c5f002 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 = 178
+RHEL_RELEASE = 180
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8c98f47c8..1a8be7a77 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -8281,6 +8281,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index f3434c01d..7160a2b3c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1096,7 +1096,7 @@ CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_DEBUG_IRQFLAGS=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 3434a8c7b..d00cc1719 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -8255,6 +8255,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index dee8218ee..584aac0e2 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -8575,6 +8575,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index d876c9416..9a9d40cbf 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -8550,6 +8550,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a539eea4d..5907a4632 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -8305,6 +8305,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 4b2effd6e..bc785a159 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -8280,6 +8280,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 877ad2689..057d83322 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -7523,6 +7523,7 @@ CONFIG_XENFS=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 9ca6b6c06..85dadd67b 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -7498,6 +7498,7 @@ CONFIG_XENFS=m
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index d3c648e2e..3719651fa 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -7029,6 +7029,7 @@ CONFIG_X86_PTDUMP=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c704ba9b0..8bd835a84 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -957,7 +957,7 @@ CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_DEBUG_IRQFLAGS=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 34d67e16e..74db4610c 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -7003,6 +7003,7 @@ CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 682aeca53..faf4b88dc 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6972,6 +6972,7 @@ CONFIG_X86_PTDUMP=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 9da3c6b59..207a43e6b 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -963,7 +963,7 @@ CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_DEBUG_IRQFLAGS=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 89f70d957..b393f274a 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6946,6 +6946,7 @@ CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index c01c33d85..30743415a 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -7571,6 +7571,7 @@ CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index af542ecce..f42ec0c94 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1015,7 +1015,7 @@ CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_DEBUG_IRQFLAGS=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index bf25392d0..d9dd0de42 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -7546,6 +7546,7 @@ CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_BACKEND=m
diff --git a/kernel.spec b/kernel.spec
index 39a5df14c..3f330cec2 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc4.20210326gitdb24726bfefa.178
+%global distro_build 0.rc5.180
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -113,13 +113,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc4.20210326gitdb24726bfefa.178
+%define pkgrelease 0.rc5.180
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20210326gitdb24726bfefa.178%{?buildid}%{?dist}
+%define specrelease 0.rc5.180%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -626,7 +626,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210326gitdb24726bfefa.tar.xz
+Source0: linux-5.12-rc5.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1281,8 +1281,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210326gitdb24726bfefa -c
-mv linux-20210326gitdb24726bfefa linux-%{KVERREL}
+%setup -q -n kernel-5.12-rc5 -c
+mv linux-5.12-rc5 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 58c257861..7df19e84b 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 d4784d181123..ba1efc2609e3 100644
+index 73add16f9898..892e60ae6d18 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -467,10 +467,10 @@ index e209081d644b..7484bcf59a1b 100644
  	return ctx.rc;
  }
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index a184529d8fa4..2fd597d400dd 100644
+index 84bb7c1929f1..2e588a4178ef 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1616,6 +1616,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1639,6 +1639,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
  	if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids))
  		return false;
 
diff --git a/sources b/sources
index 77236347f..bfc61005a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210326gitdb24726bfefa.tar.xz) = 2960a01421c3c1c8096bd6f3fcc51537069171ac8c7ca50728b1eb67a2caa5509c081adb308cc961da3e1607a243ee2a7d3710c8846e6055d25242b986f3bd0f
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc4.20210326gitdb24726bfefa.178.tar.bz2) = 4ff7e866086b51abe29a976471777a122633263061e32a357f9ff1bd37ae82a0980231141c1460bbcb83f3dfe442152ace4bff9d78b136c76e456f4d8d56a10f
-SHA512 (kernel-kabi-dw-5.12.0-0.rc4.20210326gitdb24726bfefa.178.tar.bz2) = 3f3087dbc37c9214beea8bf1a55b3b681305a25e9215cfb301189752a890765d6b2878eb7cc9a0d1bc65c0074b92a50ad722599c01d48e5652e5917f1c4d3a68
+SHA512 (linux-5.12-rc5.tar.xz) = 53d8787bbe587b6b14fa651c831293c8687dd702e9e872a732c6219d53a1f5aa21fe9e8e78e3ce201dd51eb0f68e0da128d91793948fcb430128f537c7b5ce8c
+SHA512 (kernel-abi-whitelists-5.12.0-0.rc5.180.tar.bz2) = a3517611009dfe805eea405b7597c66705d81a5e3893c229ca8484c043324cae2c679a879c8546995e76b50e2028f84fc711f68ec1919771dfc433b04e6fbff5
+SHA512 (kernel-kabi-dw-5.12.0-0.rc5.180.tar.bz2) = c1cdd0291f089ced0aab79c367f7cd548913501a018b7b6726543d70c2786ec90725f1853ccda0427067de294e6d8803cfbf7469a643d20e2d9ffe69063bfcf1