rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181

Browse Source 
* 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>
This commit is contained in:
Justin M. Forbes 2021-04-05 09:56:20 -05:00
parent dd59893b60
commit c918bd768a
25 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -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

1
kernel-aarch64-debug-rhel.config
View File

@ -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

1
kernel-aarch64-rhel.config
View File

@ -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

1
kernel-armv7hl-debug-fedora.config
View File

@ -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

1
kernel-armv7hl-fedora.config
View File

@ -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

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -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

1
kernel-armv7hl-lpae-fedora.config
View File

@ -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

1
kernel-i686-debug-fedora.config
View File

@ -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

1
kernel-i686-fedora.config
View File

@ -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

1
kernel-ppc64le-debug-fedora.config
View File

@ -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

2
kernel-ppc64le-debug-rhel.config
View File

@ -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

1
kernel-ppc64le-fedora.config
View File

@ -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

2
kernel-ppc64le-rhel.config
View File

@ -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

1
kernel-s390x-debug-fedora.config
View File

@ -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

2
kernel-s390x-debug-rhel.config
View File

@ -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

1
kernel-s390x-fedora.config
View File

@ -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

2
kernel-s390x-rhel.config
View File

@ -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

2
kernel-s390x-zfcpdump-rhel.config
View File

@ -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

1
kernel-x86_64-debug-fedora.config
View File

@ -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

3
kernel-x86_64-debug-rhel.config
View File

@ -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

1
kernel-x86_64-fedora.config
View File

@ -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

3
kernel-x86_64-rhel.config
View File

@ -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

14
kernel.spec
View File

@ -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
@ -107,13 +107,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}
@ -203,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 0
%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.12
@ -620,7 +620,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
@ -1274,8 +1274,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} .

10
patch-5.12.0-redhat.patch
View File

@ -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)

6
sources
View File

@ -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