kernel-5.16-0.rc4.20211210gitc741e49150db.32

* Fri Dec 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211210gitc741e49150db.32] - redhat/configs: enable CONFIG_NTB_NETDEV for ark (John W. Linville) - drivers/pci/pci-driver.c: Fix if/ifdef typo (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-12-11 07:22:05 -06:00 · 2021-12-11 07:22:05 -06:00 · 59ae253b39
commit 59ae253b39
parent f6c4fe5953
14 changed files with 33 additions and 57 deletions
--- 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 = 31
+RHEL_RELEASE = 32

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/f56e8c23f21528d48b494c2762b7d7674468273d
+ f56e8c23f21528d48b494c2762b7d7674468273d drivers/pci/pci-driver.c: Fix if/ifdef typo
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/32e41db9e05fedb40cae321e08e02668f030fd61
 32e41db9e05fedb40cae321e08e02668f030fd61 kernel/rh_taint.c: Update to new messaging

--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -1095,6 +1095,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3843,7 +3844,6 @@ CONFIG_NR_CPUS=4096
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -1095,6 +1095,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3822,7 +3823,6 @@ CONFIG_NR_CPUS=4096
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -954,6 +954,7 @@ CONFIG_DEBUGGER=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3661,7 +3662,6 @@ CONFIG_NR_IRQS=512
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -954,6 +954,7 @@ CONFIG_DEBUGGER=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3643,7 +3644,6 @@ CONFIG_NR_IRQS=512
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -959,6 +959,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3640,7 +3641,6 @@ CONFIG_NR_CPUS=512
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
@ -3790,7 +3790,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCI_HYPERV=m
-# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOV=y
 # CONFIG_PCI_J721E_HOST is not set
 # CONFIG_PCI_MESON is not set
 CONFIG_PCI_MSI=y
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -959,6 +959,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3622,7 +3623,6 @@ CONFIG_NR_CPUS=512
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
@ -3772,7 +3772,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCI_HYPERV=m
-# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOV=y
 # CONFIG_PCI_J721E_HOST is not set
 # CONFIG_PCI_MESON is not set
 CONFIG_PCI_MSI=y
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -965,6 +965,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3638,7 +3639,6 @@ CONFIG_NR_CPUS=32
 # CONFIG_NTB_IDT is not set
 # CONFIG_NTB_INTEL is not set
 # CONFIG_NTB is not set
-# CONFIG_NTB_NETDEV is not set
 # CONFIG_NTB_PERF is not set
 # CONFIG_NTB_PINGPONG is not set
 # CONFIG_NTB_SWITCHTEC is not set
@ -3788,7 +3788,7 @@ CONFIG_PCIE_EDR=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 CONFIG_PCI_HYPERV=m
-# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOV=y
 # CONFIG_PCI is not set
 # CONFIG_PCI_J721E_HOST is not set
 # CONFIG_PCI_MESON is not set
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -1015,6 +1015,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3834,7 +3835,7 @@ CONFIG_NTB_INTEL=m
 CONFIG_NTB=m
 CONFIG_NTB_MSI_TEST=m
 CONFIG_NTB_MSI=y
-# CONFIG_NTB_NETDEV is not set
+CONFIG_NTB_NETDEV=m
 CONFIG_NTB_PERF=m
 CONFIG_NTB_PINGPONG=m
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -1015,6 +1015,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
@ -3814,7 +3815,7 @@ CONFIG_NTB_INTEL=m
 CONFIG_NTB=m
 CONFIG_NTB_MSI_TEST=m
 CONFIG_NTB_MSI=y
-# CONFIG_NTB_NETDEV is not set
+CONFIG_NTB_NETDEV=m
 CONFIG_NTB_PERF=m
 CONFIG_NTB_PINGPONG=m
 # CONFIG_NTB_SWITCHTEC is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 0

-%global distro_build 0.rc4.20211208git2a987e65025e.31
+%global distro_build 0.rc4.20211210gitc741e49150db.32

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel

 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc4.20211208git2a987e65025e.31
+%define pkgrelease 0.rc4.20211210gitc741e49150db.32

 # This is needed to do merge window version magic
 %define patchlevel 16

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20211208git2a987e65025e.31%{?buildid}%{?dist}
+%define specrelease 0.rc4.20211210gitc741e49150db.32%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -689,7 +689,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc4-31-g2a987e65025e.tar.xz
+Source0: linux-5.16-rc4-163-gc741e49150db.tar.xz

 Source1: Makefile.rhelver

@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.16-rc4-31-g2a987e65025e -c
-mv linux-5.16-rc4-31-g2a987e65025e linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc4-163-gc741e49150db -c
+mv linux-5.16-rc4-163-gc741e49150db linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -2981,6 +2981,10 @@ fi
 #
 #
 %changelog
+* Fri Dec 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211210gitc741e49150db.32]
+- redhat/configs: enable CONFIG_NTB_NETDEV for ark (John W. Linville)
+- drivers/pci/pci-driver.c: Fix if/ifdef typo (Prarit Bhargava)
+
 * Wed Dec 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211208git2a987e65025e.31]
 - common: arm64: ensure all the required arm64 errata are enabled (Peter Robinson)
 - kernel/rh_taint.c: Update to new messaging (Prarit Bhargava) [2019377]
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@ -1686,7 +1686,7 @@ index b334af8aa264..b2a0e2fc6d47 100644
 {
 }
 diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 588588cfda48..5218a8c10a93 100644
+index 588588cfda48..f0b7f4661f3a 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
@@ -19,6 +19,7 @@
@ -1701,7 +1701,7 @@ index 588588cfda48..5218a8c10a93 100644
 };
 ATTRIBUTE_GROUPS(pci_drv);

-+#if CONFIG_RHEL_DIFFERENCES
+#ifdef CONFIG_RHEL_DIFFERENCES
 +/**
 + * pci_hw_deprecated - Tell if a PCI device is deprecated
 + * @ids: array of PCI device id structures to search in
@ -3178,36 +3178,3 @@ index c88167a414b4..e65a178ff9f4 100644
 #ifdef CONFIG_PERF_EVENTS
 int security_perf_event_open(struct perf_event_attr *attr, int type)
 {
-From f56e8c23f21528d48b494c2762b7d7674468273d Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Wed, 8 Dec 2021 15:44:29 -0500
-Subject: [PATCH] drivers/pci/pci-driver.c: Fix if/ifdef typo
-
-This needs to be an ifdef, not an if.
-
-Fixes compile error:
-
-drivers/pci/pci-driver.c:299:5: warning: "CONFIG_RHEL_DIFFERENCES" is not defined, evaluates to 0 [-Wundef]
-  299 | #if CONFIG_RHEL_DIFFERENCES
-
-Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
- drivers/pci/pci-driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 5218a8c10a93..f0b7f4661f3a 100644
--- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -296,7 +296,7 @@ static struct attribute *pci_drv_attrs[] = {
- };
- ATTRIBUTE_GROUPS(pci_drv);
-
-#if CONFIG_RHEL_DIFFERENCES
-+#ifdef CONFIG_RHEL_DIFFERENCES
- /**
-  * pci_hw_deprecated - Tell if a PCI device is deprecated
-  * @ids: array of PCI device id structures to search in
-- 
-2.33.1
-
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc4-31-g2a987e65025e.tar.xz) = b787536c5ebc434c3ab3607a9fba50027cd314b955d338e24630c9f647b5806adfc15fca1ebeacf687d5ef4533f1df4e4b3c0ccab87057451d6b0a532c188592
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc4.20211208git2a987e65025e.31.tar.bz2) = f382b99f167bfc12ae68d5a8695d0d425ebee5fd32467d78302feba827801ee1cb8e4b22ecf57c81988c92dc3f908a361caf6b871fd3c091e9e4f95873f35724
-SHA512 (kernel-kabi-dw-5.16.0-0.rc4.20211208git2a987e65025e.31.tar.bz2) = 93100527d8574e41bb102606c62382073e8c3d54a169eb4e1bb92cc4bf3c0915c1e246d25d18fe2df87860488bdbfacfbfcce5539ff71436822cbe14e4927958
+SHA512 (linux-5.16-rc4-163-gc741e49150db.tar.xz) = 850765934dffb6e21449d4a2927c144657f0d800fef2470ae9b511b08ad0a2ebd5b02bb771cc20d7cc061bde903bf8829dd99be0aad0235eb4e09fa190e1bc4e
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc4.20211210gitc741e49150db.32.tar.bz2) = da340f634885c959a99dc9b09894ed2e09f788adaee5aa04de13b9a24bce1201cd7e41d1520d1c84f85f1d5b58387fbf1e34f09b0995d7640933ab76c2521a2f
+SHA512 (kernel-kabi-dw-5.16.0-0.rc4.20211210gitc741e49150db.32.tar.bz2) = 5f523df9c72e0ca907882a93ad3bf0dd7c70f1b13cac50952df5136780775c1fdab6392b53e5b48955a7213d1707be098e034c1989dc0a86782d357a6527af11