Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc5.35.vanilla.1.fc36kernel-5.16.0-0.rc5.35.vanilla.1.fc35kernel-5.16.0-0.rc5.35.vanilla.1.fc34

28 files changed, 72 insertions, 74 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index c66a53750..2269aac0a 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 = 31
+RHEL_RELEASE = 35
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 50d8f4e58..ea487fbc1 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/e92cffb3ade9c9013c04bf608ba1019b393c23ea
+ e92cffb3ade9c9013c04bf608ba1019b393c23ea pci.h: Fix static include
+
+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
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index aee6d3827..7d937bc65 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2826,6 +2826,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
@@ -8138,7 +8139,7 @@ CONFIG_VFIO_FSL_MC=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 17807878e..92753f577 100644
--- 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
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index fe76e9629..f79b311cc 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2810,6 +2810,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
@@ -8112,7 +8113,7 @@ CONFIG_VFIO_FSL_MC=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 7dbd85836..8f2c91d24 100644
--- 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
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 046908170..744bf4301 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2851,6 +2851,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 3082df84e..899f316c2 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2836,6 +2836,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ea24bdaeb..f08af6edb 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2796,6 +2796,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 2a03fb7b5..7b6605ae0 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2781,6 +2781,7 @@ CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX7ULP_WDT is not set
 CONFIG_IMX8MM_THERMAL=m
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_IMX_DMA is not set
 CONFIG_IMX_DSP=m
 CONFIG_IMX_DSP_REMOTEPROC=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 110b6a003..e08732ad0 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2467,6 +2467,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 6ba798a40..a5f1d953d 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2450,6 +2450,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 3e0fcf0f4..ee2af07d1 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2323,6 +2323,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c6048e40f..d025d6a62 100644
--- 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
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 01e3d0e30..9e5aa65ef 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2306,6 +2306,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 8f4432aac..da73d76d1 100644
--- 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
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 36aeba687..ec7cd1d2f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2300,6 +2300,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index b7e3b5a20..998a237d3 100644
--- 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
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index c6d65fbb3..f8453f28c 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2283,6 +2283,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 3f0a9decc..855439e99 100644
--- 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
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 217b50c67..9c08785d0 100644
--- 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
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a83b72be2..e0c08ebdd 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2509,6 +2509,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@@ -7345,7 +7346,7 @@ CONFIG_VFAT_FS=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 53aeafc06..ee15995e6 100644
--- 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
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 0bea5d58c..bb2a1e4cc 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2492,6 +2492,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_IMX8QXP_ADC is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESPINTCP=y
@@ -7320,7 +7321,7 @@ CONFIG_VFAT_FS=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 1263383ad..ae1ed042f 100644
--- 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
diff --git a/kernel.spec b/kernel.spec
index be373b649..a107d1846 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc4.20211208git2a987e65025e.31
+%global distro_build 0.rc5.35
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc4.20211208git2a987e65025e.31
+%define pkgrelease 0.rc5.35
 
 # 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.rc5.35%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -691,7 +691,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-rc5.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1385,8 +1385,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-rc5 -c
+mv linux-5.16-rc5 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2199,7 +2199,7 @@ InitBuildVars
 %global perf_build_extra_opts CORESIGHT=1
 %endif
 %global perf_make \
-  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
 %if %{with_perf}
 # perf
 # make sure check-headers.sh is executable
@@ -2987,6 +2987,16 @@ fi
 #
 #
 %changelog
+* Mon Dec 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.16-0.rc5.35]
+- pci.h: Fix static include (Prarit Bhargava)
+
+* Sun Dec 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211212gita763d5a5abd6.34]
+- Enable CONFIG_VFIO_NOIOMMU for Fedora (Justin M. Forbes)
+
+* 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]
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index c52abf8e3..c28d96f4c 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -33,7 +33,7 @@
  drivers/nvme/host/core.c                           |  22 +-
  drivers/nvme/host/multipath.c                      |  19 +-
  drivers/nvme/host/nvme.h                           |   4 +
- drivers/pci/pci-driver.c                           |  79 ++++++
+ drivers/pci/pci-driver.c                           |  78 ++++++
  drivers/pci/quirks.c                               |  24 ++
  drivers/scsi/aacraid/linit.c                       |   2 +
  drivers/scsi/be2iscsi/be_main.c                    |   2 +
@@ -72,7 +72,7 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 74 files changed, 1513 insertions(+), 188 deletions(-)
+ 74 files changed, 1512 insertions(+), 188 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index 9725c546a0d4..4d440bdcf5b9 100644
@@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index ef967a26bcd3..ebaf1fbd54b4 100644
+index 765115c99655..a57d974abf71 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1550,7 +1550,7 @@ index ee4da9ab8013..0f217997a764 100644
 
  err_netlink:
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 4c63564adeaa..3541ddd16644 100644
+index 1af8a4513708..5a23e077ab86 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1617,7 +1617,7 @@ index 4c63564adeaa..3541ddd16644 100644
  }
  EXPORT_SYMBOL_GPL(nvme_complete_rq);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 7f2071f2460c..2e9f83901c77 100644
+index 13e5d503ed07..daaeb316f624 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
 @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
@@ -1664,7 +1664,7 @@ index 7f2071f2460c..2e9f83901c77 100644
 
  	if (!ctrl->max_namespaces ||
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index b334af8aa264..b2a0e2fc6d47 100644
+index 9b095ee01364..bf25ef206cd2 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
 @@ -765,6 +765,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
@@ -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..adb3a91b0ba3 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
 @@ -19,6 +19,7 @@
@@ -1697,11 +1697,11 @@ index 588588cfda48..5218a8c10a93 100644
  #include <linux/dma-map-ops.h>
  #include "pci.h"
  #include "pcie/portdrv.h"
-@@ -295,6 +296,84 @@ static struct attribute *pci_drv_attrs[] = {
+@@ -295,6 +296,83 @@ 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
@@ -1776,7 +1776,6 @@ index 588588cfda48..5218a8c10a93 100644
 +	return ret;
 +}
 +EXPORT_SYMBOL(pci_hw_disabled);
-+
 +#endif
 +
  struct drv_dev_and_id {
@@ -2119,7 +2118,7 @@ index 4e33b5eca694..b480ca4934de 100644
 
  	if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {
 diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
-index e21459f9923a..c37903d09a45 100644
+index 778b57b1f020..2a152330076d 100644
 --- a/fs/xfs/xfs_super.c
 +++ b/fs/xfs/xfs_super.c
 @@ -1594,6 +1594,7 @@ xfs_fs_fill_super(
@@ -2310,7 +2309,7 @@ index f5844908a089..901d51012738 100644
 
  struct taint_flag {
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 18a75c8e615c..fb9af56f5fec 100644
+index 18a75c8e615c..8cc24460267e 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -1478,6 +1478,22 @@ int pci_add_dynid(struct pci_driver *drv,
@@ -2330,8 +2329,8 @@ index 18a75c8e615c..fb9af56f5fec 100644
 +							    struct pci_dev *dev) { return NULL; }
 +static inline const struct pci_device_id *pci_hw_unmaintained(const struct pci_device_id *ids,
 +							      struct pci_dev *dev) { return NULL; }
-+const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
-+					    struct pci_dev *dev) {return NULL; }
++static inline const struct pci_device_id *pci_hw_disabled(const struct pci_device_id *ids,
++							  struct pci_dev *dev) {return NULL; }
 +#endif
  int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
  		    int pass);
@@ -3178,36 +3177,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
-
diff --git a/sources b/sources
index e3608887c..2ed9d2e33 100644
--- a/sources
+++ b/sources
@@ -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-rc5.tar.xz) = bc209ab036eef329b928b3d27e08aa40aa800853098ea845181f7bec7dbc93a11f5680c3ac39f718ffe57cd1b7ff93fd689268021cabdb5bdfb515164b8a3200
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc5.35.tar.bz2) = ea3fd7e739b73e0d045ccdacbe80862426f43365e072c916002e31b1a104d9e6c82d1a9a9570ba455c25e804a288b4886ab71f8e6a426481586d7fb4785b051a
+SHA512 (kernel-kabi-dw-5.16.0-0.rc5.35.tar.bz2) = 905132c702436411c9e4928e258da7a2aa174c6ef1ecdfb4010ea663482c1d30f2a62c5bb0cd3fa3233ce54a8f81ed00480f9f6b58fa1644f505631f1cc3679e