summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-fedora.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.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config1
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config1
-rwxr-xr-xkernel.spec15
-rw-r--r--patch-5.12.0-redhat.patch6
-rw-r--r--sources6
27 files changed, 39 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index c37623596..f7cbe41db 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 = 177
+RHEL_RELEASE = 178
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 07c0244c3..8c98f47c8 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4762,6 +4762,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_IMX_IIM is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 10606785a..f3434c01d 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3847,6 +3847,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_BCM_OCOTP is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 1fa002620..3434a8c7b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -4739,6 +4739,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_IMX_IIM is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 1ea1e5ad6..3df3c161c 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3827,6 +3827,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_BCM_OCOTP is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 0f487ced7..dee8218ee 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -4838,6 +4838,7 @@ CONFIG_NS83820=m
CONFIG_NULL_TTY=m
CONFIG_NVEC_PAZ00=y
CONFIG_NVEC_POWER=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
CONFIG_NVMEM_IMX_IIM=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index dd8805e45..d876c9416 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -4816,6 +4816,7 @@ CONFIG_NS83820=m
CONFIG_NULL_TTY=m
CONFIG_NVEC_PAZ00=y
CONFIG_NVEC_POWER=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
CONFIG_NVMEM_IMX_IIM=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a44e01b1b..a539eea4d 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4732,6 +4732,7 @@ CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
CONFIG_NVMEM_IMX_IIM=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 563b49088..4b2effd6e 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -4710,6 +4710,7 @@ CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
CONFIG_NVMEM_IMX_IIM=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index b5690eda9..877ad2689 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -4368,6 +4368,7 @@ CONFIG_NSC_GPIO=m
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
# CONFIG_NUMA is not set
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index e90799a79..9ca6b6c06 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -4346,6 +4346,7 @@ CONFIG_NSC_GPIO=m
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
# CONFIG_NUMA is not set
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 668c04c34..d3c648e2e 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4094,6 +4094,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 078ec0ad4..c704ba9b0 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -3685,6 +3685,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 0ea578320..34d67e16e 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4071,6 +4071,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 1499e2042..4d0ea7a26 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -3668,6 +3668,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 6c7e257ce..682aeca53 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4064,6 +4064,7 @@ CONFIG_NULL_TTY=m
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 3decc0d75..9da3c6b59 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3661,6 +3661,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 3986da7b5..89f70d957 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4041,6 +4041,7 @@ CONFIG_NULL_TTY=m
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index dd3da9a99..089ed7ec0 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3644,6 +3644,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 873c899a6..ba7b3637d 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3667,6 +3667,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
# CONFIG_NUMA is not set
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
# CONFIG_NVME_FC is not set
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5d5d98c92..c01c33d85 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -4420,6 +4420,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 002772c5d..af542ecce 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -3863,6 +3863,7 @@ CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f7bb18370..7438aef9d 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -4398,6 +4398,7 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
CONFIG_NVME_HWMON=y
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index f1393add7..59d31424f 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -3844,6 +3844,7 @@ CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
CONFIG_NVME_FC=m
# CONFIG_NVME_HWMON is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
diff --git a/kernel.spec b/kernel.spec
index f8bf32e33..e7f3588af 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.20210325gite138138003eb.177
+%global distro_build 0.rc4.20210326gitdb24726bfefa.178
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -111,13 +111,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.12.0
-%define pkgrelease 0.rc4.20210325gite138138003eb.177
+%define pkgrelease 0.rc4.20210326gitdb24726bfefa.178
# This is needed to do merge window version magic
%define patchlevel 12
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20210325gite138138003eb.177%{?buildid}%{?dist}
+%define specrelease 0.rc4.20210326gitdb24726bfefa.178%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -624,7 +624,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210325gite138138003eb.tar.xz
+Source0: linux-20210326gitdb24726bfefa.tar.xz
Source1: Makefile.rhelver
@@ -1278,8 +1278,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20210325gite138138003eb -c
-mv linux-20210325gite138138003eb linux-%{KVERREL}
+%setup -q -n kernel-20210326gitdb24726bfefa -c
+mv linux-20210326gitdb24726bfefa linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2793,6 +2793,9 @@ fi
#
#
%changelog
+* Fri Mar 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210326gitdb24726bfefa.178]
+- New configs in fs/pstore (CKI@GitLab)
+
* Thu Mar 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210325gite138138003eb.177]
- New configs in arch/powerpc (Fedora Kernel Team)
- configs: enable BPF LSM on Fedora and ARK (Ondrej Mosnacek)
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index b97ce5c86..58c257861 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -192,10 +192,10 @@ index 5da96f5df48f..a35494d5910d 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 5656e7aacd69..fb23ebe99efe 100644
+index e4e1b6550115..800dd64437a8 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -899,7 +899,7 @@ endchoice
+@@ -909,7 +909,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -204,7 +204,7 @@ index 5656e7aacd69..fb23ebe99efe 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
-@@ -1156,6 +1156,7 @@ config XEN
+@@ -1166,6 +1166,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
diff --git a/sources b/sources
index f3d3ae807..77236347f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210325gite138138003eb.tar.xz) = 301e6898d11cff3befeff254412bd74b63652450f3937c96de12f2527f6a91bcfb514bdd775154ff8269aa7eb3dcb34b83ba9a4f1323026d78db072e7ce267ff
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc4.20210325gite138138003eb.177.tar.bz2) = 542796b1b221a8d45871cbce579031675478a76cb3a647baa4c4ba6caf68b7be47250a8d8a873ff3294291c7d7aeb94c96dc5a0c27964349ea9a6f2847e86814
-SHA512 (kernel-kabi-dw-5.12.0-0.rc4.20210325gite138138003eb.177.tar.bz2) = b2638b88c46595dc96f6b236f38ca415eebfa3efd834de8840b77b460ce8afaac2b4e18ef77363a4d716f70a8b32c5d961c7f0489764e66abeff05adee6efc8e
+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