diff --git a/Makefile.rhelver b/Makefile.rhelver index c9accf1f6..d0a2c1840 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 = 144 +RHEL_RELEASE = 149 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 0e930e0bd..5a5f3cbaf 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/2eeb557d7ea6e3a1802dca85e12e6a2ad83fdce0 - 2eeb557d7ea6e3a1802dca85e12e6a2ad83fdce0 Bluetooth: L2CAP: Try harder to accept device not knowing options +https://gitlab.com/cki-project/kernel-ark/-/commit/67dabe40324eee91aa9f135391ca7b0eb9a7e069 + 67dabe40324eee91aa9f135391ca7b0eb9a7e069 Bluetooth: L2CAP: Try harder to accept device not knowing options https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c 035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED diff --git a/kernel.spec b/kernel.spec index 710eaddff..36219e8aa 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc6.20210204git61556703b610.144 +%global distro_build 0.rc7.149 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc6.20210204git61556703b610.144 +%define pkgrelease 0.rc7.149 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20210204git61556703b610.144%{?buildid}%{?dist} +%define specrelease 0.rc7.149%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -201,7 +201,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.11 @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210204git61556703b610.tar.xz +Source0: linux-5.11-rc7.tar.xz Source1: Makefile.rhelver @@ -719,6 +719,9 @@ Source56: update_scripts.sh Source54: mod-internal.list +Source100: rheldup3.x509 +Source101: rhelkpatch1.x509 + Source200: check-kabi Source201: Module.kabi_aarch64 @@ -1246,8 +1249,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210204git61556703b610 -c -mv linux-20210204git61556703b610 linux-%{KVERREL} +%setup -q -n kernel-5.11-rc7 -c +mv linux-5.11-rc7 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1323,6 +1326,18 @@ do done %endif +# Add DUP and kpatch certificates to system trusted keys for RHEL +%if 0%{?rhel} +%if %{signkernel}%{signmodules} +openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem +openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem +cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem +for i in *.config; do + sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=""@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i +done +%endif +%endif + cp %{SOURCE52} . OPTS="" %if %{with_configchecks} @@ -2736,10 +2751,22 @@ fi # # %changelog -* Thu Feb 04 2021 Fedora Kernel Team [5.11.0-0.rc6.20210204git61556703b610.144] -- Rename the master branch to rawhide for Fedora (Justin M. Forbes) +* Mon Feb 08 2021 Fedora Kernel Team [5.11.0-0.rc7.149] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* Mon Feb 08 2021 Fedora Kernel Team [5.11.0-0.rc7.148] +- redhat: add DUP and kpatch certificates to system trusted keys for RHEL build (Herton R. Krzesinski) + +* Mon Feb 08 2021 Fedora Kernel Team [5.11.0-0.rc6.20210208git825b5991a46e.147] +- The comments in CONFIG_USB_RTL8153_ECM actually turn off CONFIG_USB_RTL8152 (Justin M. Forbes) + +* Sat Feb 06 2021 Fedora Kernel Team [5.11.0-0.rc6.20210206git17fbcdf9f163.145] +- Update CKI pipeline project (Veronika Kabatova) + +* Fri Feb 05 2021 Fedora Kernel Team [5.11.0-0.rc6.20210205gitdd86e7fa07a3.144] +- Turn off additional KASAN options for Fedora (Justin M. Forbes) +- Rename the master branch to rawhide for Fedora (Justin M. Forbes) + * Thu Feb 04 2021 Fedora Kernel Team [5.11.0-0.rc6.20210204git61556703b610.143] - Makefile targets for packit integration (Ben Crocker) - Turn off KASAN for rawhide debug builds (Justin M. Forbes) diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 81618caea..f59088ae8 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f5842126e89d..5d5845be64e8 100644 +index ade44ac4cc2f..0c4b4407dd7f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -216,7 +216,7 @@ index f5842126e89d..5d5845be64e8 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -495,6 +499,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -494,6 +498,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ @@ -224,7 +224,7 @@ index f5842126e89d..5d5845be64e8 100644 -Werror=return-type -Wno-format-security \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ -@@ -1253,7 +1258,13 @@ endef +@@ -1248,7 +1253,13 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ @@ -383,7 +383,7 @@ index 35ad8480c464..fade48ea4c2d 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 3412c4595efd..637343dc5ade 100644 +index 740f3bdb3f61..26c35aa38ea7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -19,6 +19,7 @@ @@ -402,8 +402,8 @@ index 3412c4595efd..637343dc5ade 100644 /* * max_low_pfn_mapped: highest directly mapped pfn < 4 GB -@@ -728,7 +730,51 @@ static void __init trim_low_memory_range(void) - */ +@@ -730,7 +732,51 @@ static void __init trim_low_memory_range(void) + { memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE)); } - @@ -455,7 +455,7 @@ index 3412c4595efd..637343dc5ade 100644 /* * Dump out kernel offset information on panic. */ -@@ -953,6 +999,13 @@ void __init setup_arch(char **cmdline_p) +@@ -955,6 +1001,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -469,7 +469,7 @@ index 3412c4595efd..637343dc5ade 100644 dmi_setup(); /* -@@ -1111,19 +1164,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1113,19 +1166,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -490,7 +490,7 @@ index 3412c4595efd..637343dc5ade 100644 reserve_initrd(); -@@ -1232,6 +1273,8 @@ void __init setup_arch(char **cmdline_p) +@@ -1234,6 +1275,8 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -562,7 +562,7 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 1db063b02f63..f0a5fb19524f 100644 +index 22566b4b3150..4c2294593928 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1620,6 +1620,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) diff --git a/rheldup3.x509 b/rheldup3.x509 new file mode 100644 index 000000000..5df3b4f30 Binary files /dev/null and b/rheldup3.x509 differ diff --git a/rhelkpatch1.x509 b/rhelkpatch1.x509 new file mode 100644 index 000000000..0c774ba73 Binary files /dev/null and b/rhelkpatch1.x509 differ diff --git a/sources b/sources index 9397ce17e..f129b56e3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-20210204git61556703b610.tar.xz) = e2d4e5772514f0860883b51feba9f4c4c5473cf8fed5898c5b9452333935bc47931cbc8d8c44d39fed94b904502515fcd5b9d876f24ad5ae8ab6b4f3df0f8b9f -SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.20210204git61556703b610.144.tar.bz2) = aef2951ce042235f12d78d55c56cadc244a405d432facbcf3e4a4619a58972603cd6f62f1c29a4aa6868ac0a1f8415d14ee27995ea05950367080a7b54e8e797 -SHA512 (kernel-kabi-dw-5.11.0-0.rc6.20210204git61556703b610.144.tar.bz2) = 0e029eef7ff2148ef8c7a16be83223a884dc9037517352f1e72790d2b3752e2435742030f0905cab192089202c31f7db935ed0846ba65add1a479a29447f791d +SHA512 (linux-5.11-rc7.tar.xz) = b1f2faf38d81866d4d0d5e3448fa009a6615ec1a7e3d15fd241b2353547205406c16cea0ff031c3da3c83012a912a16dcee891bf0c01be00512a3cbcd7835e62 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.149.tar.bz2) = a22d8336949f3fa16131bde38542300c29da85d76d8154530b1268c483fb73a705b57991c855454f7b0d550e40b7e251d17dea7428eaaa7156ad1ebd9279a7eb +SHA512 (kernel-kabi-dw-5.11.0-0.rc7.149.tar.bz2) = 204c8dddb1a844520af822ac9eb737803099035d0692fc78fa21dc7c5d0ec6d3a1d0dd134a80cb50580287dbf69b3124c6016e7a4875831eb6b63a6be443ac88