diff --git a/Makefile.rhelver b/Makefile.rhelver index 5acae9995..d6af8b391 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 = 40 +RHEL_RELEASE = 41 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 046143e16..5f50ee085 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/c61af5f7ab21fdc698bd9f0414e7f7a0774e841c - c61af5f7ab21fdc698bd9f0414e7f7a0774e841c Filter out LTO build options from the perl ccopts +https://gitlab.com/cki-project/kernel-ark/-/commit/514c3a2c3adc4a97d99c39c8e91327740a54807c + 514c3a2c3adc4a97d99c39c8e91327740a54807c Filter out LTO build options from the perl ccopts -https://gitlab.com/cki-project/kernel-ark/-/commit/1d3841035d16e2ce7796d38b1721e4665a2ed160 - 1d3841035d16e2ce7796d38b1721e4665a2ed160 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 +https://gitlab.com/cki-project/kernel-ark/-/commit/7638e86597c1d8e311a2934d4fc8d1baf86cc248 + 7638e86597c1d8e311a2934d4fc8d1baf86cc248 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 https://gitlab.com/cki-project/kernel-ark/-/commit/17b0f7f1d49df30661b517d668715ff5ee1bab09 17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only diff --git a/kernel.spec b/kernel.spec index 5c06cb1f2..5a9faf6fe 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20201013gitc4439713e82a.40 +%global distro_build 0.rc0.20201014gitb5fc7a89e58b.41 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +69,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc0.20201013gitc4439713e82a.40 +%define pkgrelease 0.rc0.20201014gitb5fc7a89e58b.41 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20201013gitc4439713e82a.40%{?buildid}%{?dist} +%define specrelease 0.rc0.20201014gitb5fc7a89e58b.41%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201013gitc4439713e82a.tar.xz +Source0: linux-20201014gitb5fc7a89e58b.tar.xz Source1: Makefile.rhelver @@ -1210,8 +1210,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201013gitc4439713e82a -c -mv linux-20201013gitc4439713e82a linux-%{KVERREL} +%setup -q -n kernel-20201014gitb5fc7a89e58b -c +mv linux-20201014gitb5fc7a89e58b linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2647,10 +2647,13 @@ fi # # %changelog -* Tue Oct 13 2020 Fedora Kernel Team [5.10.0-0.rc0.20201013gitc4439713e82a.39] +* Wed Oct 14 2020 Fedora Kernel Team [5.10.0-0.rc0.20201014gitb5fc7a89e58b.40] - Filter out LTO build options from the perl ccopts ("Justin M. Forbes") - Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +* Wed Oct 14 2020 Fedora Kernel Team [5.10.0-0.rc0.20201014gitb5fc7a89e58b.39.test] +- b5fc7a89e58b rebase + * Tue Oct 13 2020 Fedora Kernel Team [5.10.0-0.rc0.20201013gitc4439713e82a.38.test] - c4439713e82a rebase diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index d3788bbe9..cd4d3700c 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -243,10 +243,10 @@ index 51540b291738..cb84fca3accc 100644 $(version_h): FORCE diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index e67ef15c800f..a8cd3715ca43 100644 +index 82d0b00bc7a5..c8acc3eaebf4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1515,9 +1515,9 @@ config HIGHMEM +@@ -1516,9 +1516,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -290,7 +290,7 @@ index a13d90206472..6a6aae01755b 100644 #define get_user(x, p) \ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 4b136e923ccb..9179f909ed02 100644 +index 9cd317f00034..584d7353b48d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -869,7 +869,7 @@ endchoice @@ -302,7 +302,7 @@ index 4b136e923ccb..9179f909ed02 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 -@@ -1141,6 +1141,7 @@ config XEN +@@ -1128,6 +1128,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) @@ -374,7 +374,7 @@ index c2c1b4e723ea..1247f80a3bf0 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 7824fc62c7cd..6f38a3f502ca 100644 +index c51158914ea2..38d0794b7675 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1307,6 +1307,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -2002,10 +2002,10 @@ index d48414e295a0..ba0e384412c9 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index 2b7e7b5f38ed..b3bacfdcb727 100644 +index 020270ce790b..de841140216b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, +@@ -138,6 +138,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, */ static struct pci_device_id megasas_pci_table[] = { @@ -2013,7 +2013,7 @@ index 2b7e7b5f38ed..b3bacfdcb727 100644 {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, /* xscale IOP */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, -@@ -151,6 +152,7 @@ static struct pci_device_id megasas_pci_table[] = { +@@ -156,6 +157,7 @@ static struct pci_device_id megasas_pci_table[] = { /* xscale IOP, vega */ {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, /* xscale IOP */ @@ -2224,10 +2224,10 @@ index d7c0e73af2b9..c2af576741d5 100644 #ifdef CONFIG_RESET_ATTACK_MITIGATION diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index c25b8e41c0ea..7a7a47665771 100644 +index e4aa29b1ad62..958f058db539 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -602,7 +602,24 @@ extern enum system_states { +@@ -601,7 +601,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -2253,7 +2253,7 @@ index c25b8e41c0ea..7a7a47665771 100644 #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) struct taint_flag { -@@ -1037,4 +1054,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1036,4 +1053,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) diff --git a/sources b/sources index 4f980d429..b5e028ea2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-20201013gitc4439713e82a.tar.xz) = 98ba3631f8834d7dbdd3e40b58b573f63f20b70037467c52ec493d50366f00cc31c90296344afa7a3681ee2cbce470b00bb8a058869288d35c83699fc5c0220a -SHA512 (kernel-abi-whitelists-5.10.0-0.rc0.20201013gitc4439713e82a.40.tar.bz2) = 420825fc3cec94fe510be0220fd19b38d45380ba33f4a270b2ed8633201350da5853571e512d2f9e48a70651bddbe84f89c2bafdea6f2093ff2c781f92c5a292 -SHA512 (kernel-kabi-dw-5.10.0-0.rc0.20201013gitc4439713e82a.40.tar.bz2) = d43de632537909b4c6481bec179cd3b825029706171492e80ecb8fe13cfd54dcd318dad8ce1e9056bd4e833c2162136f44fd1872cf37f73b3a1f47aa9584d2d5 +SHA512 (linux-20201014gitb5fc7a89e58b.tar.xz) = 20afa74d91a0b5d74ff4db67e2fd40c94a40753810d2bfdc280db50a2eac2eff88859e8fd8ac3fc0614d79eedfd57ee9e66e6986dcf02dd2ad2ffff7420cf0d6 +SHA512 (kernel-abi-whitelists-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.tar.bz2) = eec67d1571512a94e374d1478e02a2cb14a992298177d127d594efacdb472e292db660af6992771f3940b5342e8310da3f69e70ddae805fac49a26046651bfbb +SHA512 (kernel-kabi-dw-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.tar.bz2) = f3b87f663b5e62c824528a0c046af1c34ff575f4733bf70e1f7b9ae33f2e3e3d4eb9c2ecfee778e5a246f0287262d9ddf845b91d21095727f9df3857a62961a3