From f55c3e9ed8605ff28cb9a922efbab1055947e213 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 24 Jan 2022 09:26:58 -0600 Subject: [PATCH] kernel-5.17-0.rc1.20220124gitdd81e1c7d5fb.76 * Mon Jan 24 2022 Fedora Kernel Team [5.17-0.rc1.20220124gitdd81e1c7d5fb.76] - objtool: check: give big enough buffer for pv_ops (Sergei Trofimovich) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- generate_crashkernel_default.sh | 25 --------------------- kernel-aarch64-debug-fedora.config | 4 ++-- kernel-aarch64-debug-rhel.config | 5 ++++- kernel-aarch64-rhel.config | 5 ++++- kernel-armv7hl-debug-fedora.config | 4 ++-- kernel-armv7hl-lpae-debug-fedora.config | 4 ++-- kernel-i686-debug-fedora.config | 4 ++-- kernel-ppc64le-debug-fedora.config | 4 ++-- kernel-ppc64le-debug-rhel.config | 5 ++++- kernel-ppc64le-rhel.config | 5 ++++- kernel-s390x-debug-fedora.config | 4 ++-- kernel-s390x-debug-rhel.config | 5 ++++- kernel-s390x-rhel.config | 5 ++++- kernel-s390x-zfcpdump-rhel.config | 5 ++++- kernel-x86_64-debug-fedora.config | 4 ++-- kernel-x86_64-debug-rhel.config | 5 ++++- kernel-x86_64-rhel.config | 5 ++++- kernel.spec | 28 ++++++++++++----------- patch-5.17-redhat.patch | 30 ++++++++++++------------- sources | 6 ++--- 22 files changed, 86 insertions(+), 82 deletions(-) delete mode 100755 generate_crashkernel_default.sh diff --git a/Makefile.rhelver b/Makefile.rhelver index 168e1937b..fea2f7411 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 = 73 +RHEL_RELEASE = 76 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 24b23cb01..8d957d650 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/8783212c76137450007cd397847b20f9ae2634c4 - 8783212c76137450007cd397847b20f9ae2634c4 objtool: check: give big enough buffer for pv_ops +https://gitlab.com/cki-project/kernel-ark/-/commit/5ffb2d5241cfb4574db111b005610121f014e304 + 5ffb2d5241cfb4574db111b005610121f014e304 objtool: check: give big enough buffer for pv_ops https://gitlab.com/cki-project/kernel-ark/-/commit/c1ee15318f4a2688057fd1aeee6272603d0871f0 c1ee15318f4a2688057fd1aeee6272603d0871f0 Fixup merge in random.c diff --git a/generate_crashkernel_default.sh b/generate_crashkernel_default.sh deleted file mode 100755 index 46d454607..000000000 --- a/generate_crashkernel_default.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -kernelver=$1 && shift -arch=$1 && shift -rootfs=$1 && shift - -output="${rootfs}/lib/modules/${kernelver}/crashkernel.default" - -case $arch in -x86_64|s390*) - ck_cmdline="crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M" - ;; -arm64|aarch64) - ck_cmdline="crashkernel=2G-:448M" - ;; -powerpc|ppc64*) - ck_cmdline="crashkernel=2G-4G:384M,4G-16G:512M,16G-64G:1G,64G-128G:2G,128G-:4G" - ;; -*) - ck_cmdline="" - ;; -esac - -cat > "$output" <= 20150904-56.git6ebf5d57\ +Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\ +Recommends: linux-firmware\ Requires(preun): systemd >= 200\ Conflicts: xfsprogs < 4.3.0-1\ Conflicts: xorg-x11-drv-vmmouse < 13.0.99\ @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-11444-gc2c94b3b187d -c -mv linux-5.16-11444-gc2c94b3b187d linux-%{KVERREL} +%setup -q -n kernel-5.17-rc1-32-gdd81e1c7d5fb -c +mv linux-5.17-rc1-32-gdd81e1c7d5fb linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2120,9 +2120,6 @@ BuildKernel() { # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete - # Generate crashkernel default config - %{SOURCE83} "$KernelVer" "$Arch" "$RPM_BUILD_ROOT" - # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %ifarch x86_64 aarch64 @@ -2929,7 +2926,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ -/lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\ /lib/modules/%{KVERREL}%{?3:+%{3}}/systemtap\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ @@ -2986,9 +2982,15 @@ fi # # %changelog -* Fri Jan 21 2022 Fedora Kernel Team [5.17-0.rc0.20220121gitc2c94b3b187d.73] +* Mon Jan 24 2022 Fedora Kernel Team [5.17-0.rc1.20220124gitdd81e1c7d5fb.76] - objtool: check: give big enough buffer for pv_ops (Sergei Trofimovich) +* Sat Jan 22 2022 Fedora Kernel Team [5.17-0.rc0.20220122git1c52283265a4.73] +- Revert "[redhat] Generate a crashkernel.default for each kernel build" (Coiby Xu) +- spec: make linux-firmware weak(er) dependency (Jan Stancek) +- rtw89: enable new driver rtw89 and device RTK8852AE (Íñigo Huguet) +- Config consolidation into common (Justin M. Forbes) + * Thu Jan 20 2022 Fedora Kernel Team [5.17-0.rc0.20220120gitfa2e1ba3e9e3.71] - Fixup merge in random.c (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 0ecf86178..a3478f0c5 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -129,7 +129,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 3f07f0f04475..b96b47caa489 100644 +index 0fb4f94a6885..f19ab6b40583 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -175,10 +175,10 @@ index fabe39169b12..bfd2929ab514 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 dc10d26cb432..b30c5a7659f5 100644 +index 6978140edfa4..a9c3542c2577 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1024,7 +1024,7 @@ endchoice +@@ -1023,7 +1023,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -187,7 +187,7 @@ index dc10d26cb432..b30c5a7659f5 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 -@@ -1266,6 +1266,7 @@ config XEN +@@ -1265,6 +1265,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -656,7 +656,7 @@ index c59265146e9c..caa8458edde2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index b411182df6f6..a113450d0521 100644 +index 68613f0b6887..8198a831e626 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -344,6 +344,7 @@ @@ -821,7 +821,7 @@ index b411182df6f6..a113450d0521 100644 if (!(flags & GRND_INSECURE) && !crng_ready()) { if (flags & GRND_NONBLOCK) return -EAGAIN; -@@ -2220,3 +2322,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) +@@ -2230,3 +2332,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) add_device_randomness(buf, size); } EXPORT_SYMBOL_GPL(add_bootloader_randomness); @@ -1423,10 +1423,10 @@ index 8b86406b7162..2dffe129b902 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index 091b45024d34..4457c5c7e173 100644 +index 4acd8f9a48e1..57b430c4d814 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c -@@ -5318,6 +5318,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -5320,6 +5320,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT); } @@ -1438,7 +1438,7 @@ index 091b45024d34..4457c5c7e173 100644 error = scsi_add_host(sh, &ioc->pcidev->dev); if (error) { dprintk(ioc, printk(MYIOC_s_ERR_FMT -@@ -5381,6 +5386,10 @@ static void mptsas_remove(struct pci_dev *pdev) +@@ -5383,6 +5388,10 @@ static void mptsas_remove(struct pci_dev *pdev) } static struct pci_device_id mptsas_pci_table[] = { @@ -1449,7 +1449,7 @@ index 091b45024d34..4457c5c7e173 100644 { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064, PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, -@@ -5393,6 +5402,7 @@ static struct pci_device_id mptsas_pci_table[] = { +@@ -5395,6 +5404,7 @@ static struct pci_device_id mptsas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP, PCI_ANY_ID, PCI_ANY_ID }, @@ -2096,10 +2096,10 @@ index 47a1c8bddf86..e309d992e2ad 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index db9fe4843529..2473d2520bcd 100644 +index eee0d9ebfa6c..787d364f3b4a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -4763,6 +4763,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) +@@ -4760,6 +4760,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) } if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { @@ -2107,7 +2107,7 @@ index db9fe4843529..2473d2520bcd 100644 if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); -@@ -4773,6 +4774,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) +@@ -4770,6 +4771,10 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) "DAX unsupported by block device."); goto failed_mount; } @@ -3008,10 +3008,10 @@ index 000000000000..345a979cd0e4 +} +EXPORT_SYMBOL(mark_tech_preview); diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index ef77be575d87..977930662f33 100644 +index 5ae443b2882e..4b929f4cb77a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -245,6 +245,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -195,6 +195,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; diff --git a/sources b/sources index 64ad59e12..946c92134 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-11444-gc2c94b3b187d.tar.xz) = 783132284701cd1114fb15f9ef2b379fcf1bae874a5c1b8b6e6f4b3ac250fd4bf621372c97513eb8174ebee5067dc294e0e031eee95aeac7dcb78cf6462aa323 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220121gitc2c94b3b187d.73.tar.bz2) = d23e8b2705394193d8a93fe94866e570a515e638fbd78e72aeaebb66333f17d442cb1c75e419c8d9187d560e70b8683302a248e42f7c20ad80d6ef6f39e9a0f0 -SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220121gitc2c94b3b187d.73.tar.bz2) = a570f47acd8d0af11b8684536269cfdb6f64051c7a8c419ee1a42297b4cdabc770877eee97e37596f35e8a46e0e81a2bd67461abd4380df988c08fcadbf84cb6 +SHA512 (linux-5.17-rc1-32-gdd81e1c7d5fb.tar.xz) = dc85e2d71fb14728df625a65e86546dc6e67990d5ecd6b62fe8fce9263d5d537d634cbc18fa8e6a4a02c5db31b58062bf55c093b173fb7882c04a89af1b5dbdb +SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220124gitdd81e1c7d5fb.76.tar.bz2) = 7dcd86131198dafc3c18ca70c9c707409e85460b56c197aabbca0df3d88f59415910291df6a1e91cd293d1618046f22a1aa2c045c9ba64dc3ec7b09e7d92858a +SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220124gitdd81e1c7d5fb.76.tar.bz2) = 848b94062e50e3ea141ef9b0f9470873234ff546a4cb0059c1b0e62517aff3be03565db43e47dcf14a694a1c599c568ba39e500e83dc78f819a3a23f421d2376