diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-31 11:35:50 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-31 11:35:50 -0500 |
| commit | dd59893b60ab9fe8e12e16a2941908408a9781ed (patch) | |
| tree | 17d458931ae43e8fa1d607468d57ed6922b5d480 | |
| parent | 424839b9c69d0380b65a338e105f91e4d2e44b43 (diff) | |
| download | kernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.tar.gz kernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.tar.xz kernel-dd59893b60ab9fe8e12e16a2941908408a9781ed.zip | |
kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181
* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181]
- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini)
- Remove _legacy_common_support (Justin M. Forbes)
- redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
27 files changed, 49 insertions, 55 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index e42c5f002..ccd4890d5 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 = 180 +RHEL_RELEASE = 181 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 1a8be7a77..8d87e9058 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6357,7 +6357,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set CONFIG_SLIMBUS=m CONFIG_SLIM_QCOM_CTRL=m CONFIG_SLIM_QCOM_NGD_CTRL=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 7160a2b3c..22aaff5fa 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5060,7 +5060,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5760,7 +5760,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d00cc1719..bfc38088c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6334,7 +6334,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set CONFIG_SLIMBUS=m CONFIG_SLIM_QCOM_CTRL=m CONFIG_SLIM_QCOM_NGD_CTRL=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3df3c161c..08a178f10 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5039,7 +5039,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5737,7 +5737,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 584aac0e2..6b9d77ec4 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6510,7 +6510,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 9a9d40cbf..9435a1e66 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6488,7 +6488,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5907a4632..42546b261 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6313,7 +6313,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bc785a159..858d06a7a 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6291,7 +6291,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 057d83322..855767444 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5721,7 +5721,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 85dadd67b..64d706c31 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5699,7 +5699,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 3719651fa..ce89bcfb0 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5398,7 +5398,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 8bd835a84..e0d76c31a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3685,7 +3685,6 @@ 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 @@ -4882,7 +4881,7 @@ CONFIG_SIMPLE_GPIO=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5573,7 +5572,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 74db4610c..190466b90 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5375,7 +5375,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4d0ea7a26..4438ccc29 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3668,7 +3668,6 @@ 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 @@ -4865,7 +4864,7 @@ CONFIG_SIMPLE_GPIO=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5554,7 +5553,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index faf4b88dc..b5a856330 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5339,7 +5339,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y # CONFIG_SLIP is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 207a43e6b..8570a0b9a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3661,7 +3661,6 @@ 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 @@ -4822,7 +4821,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5512,7 +5511,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b393f274a..8f74a3d6a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5316,7 +5316,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y # CONFIG_SLIP is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 089ed7ec0..cbfac0e68 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3644,7 +3644,6 @@ 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 @@ -4805,7 +4804,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5493,7 +5492,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ba7b3637d..a84ccab20 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3667,7 +3667,6 @@ 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 @@ -4834,7 +4833,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5527,7 +5526,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y # CONFIG_TMPFS is not set CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 30743415a..a818f3444 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5767,7 +5767,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index f42ec0c94..1d24d40e9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3863,7 +3863,6 @@ 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 @@ -5037,7 +5036,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5789,7 +5788,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cc72625f8..ef7d1875b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5745,7 +5745,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 59d31424f..1f40cc183 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3844,7 +3844,6 @@ 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 @@ -5017,7 +5016,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y # CONFIG_SLAB is not set -CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_SLICOSS is not set # CONFIG_SLIMBUS is not set CONFIG_SLIP_COMPRESSED=y @@ -5767,7 +5766,7 @@ CONFIG_TLS=m # CONFIG_TLS_TOE is not set # CONFIG_TMP006 is not set # CONFIG_TMP007 is not set -# CONFIG_TMPFS_INODE64 is not set +CONFIG_TMPFS_INODE64=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_TMPFS=y diff --git a/kernel.spec b/kernel.spec index 3c1448be7..8c4201ac7 100755 --- a/kernel.spec +++ b/kernel.spec @@ -41,10 +41,6 @@ # will not see them. %global __spec_install_pre %{___build_pre} -# Short-term fix so the package builds with GCC 10. -# This should go away soon. -%define _legacy_common_support 1 - # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio # compression for rpms (xz, level 2). # Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins @@ -70,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.180 +%global distro_build 0.rc5.20210331git2bb25b3a748a.181 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -111,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc5.180 +%define pkgrelease 0.rc5.20210331git2bb25b3a748a.181 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.180%{?buildid}%{?dist} +%define specrelease 0.rc5.20210331git2bb25b3a748a.181%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -207,7 +203,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 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.12 @@ -624,7 +620,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-rc5.tar.xz +Source0: linux-20210331git2bb25b3a748a.tar.xz Source1: Makefile.rhelver @@ -1278,8 +1274,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-rc5 -c -mv linux-5.12-rc5 linux-%{KVERREL} +%setup -q -n kernel-20210331git2bb25b3a748a -c +mv linux-20210331git2bb25b3a748a linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2793,6 +2789,11 @@ fi # # %changelog +* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181] +- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini) +- Remove _legacy_common_support (Justin M. Forbes) +- redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede) + * 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) diff --git a/mod-blacklist.sh b/mod-blacklist.sh index e8797659e..6127d145f 100755 --- a/mod-blacklist.sh +++ b/mod-blacklist.sh @@ -150,7 +150,7 @@ fi # this replaces the old die_floppy_die.patch which removed the PNP-id from # the module -floppylist=("$RpmDir"/"$ModDir"/extra/drivers/block/floppy.ko*) +floppylist=("$RpmDir"/"$ModDir"/kernel/drivers/block/floppy.ko*) if [[ -n ${floppylist[0]} && -f ${floppylist[0]} ]]; then blacklist "floppy" fi @@ -1,3 +1,3 @@ -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 +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 |