summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-12-14 21:56:00 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-12-14 21:56:00 +0100
commit6aac06f1b98511ffb26ee0a108e000d7f5040be4 (patch)
tree4d6d913d87ba6a94581e3f217e9cfbe2da2185db
parent527c790fb66c203af321e8d6bae2882a69a35def (diff)
parenta7f4b95efdb0ddf2911054607d12607104e416b2 (diff)
downloadkernel-5.16.0-0.rc5.20211214git5472f14a3742.36.vanilla.1.fc35.tar.gz
kernel-5.16.0-0.rc5.20211214git5472f14a3742.36.vanilla.1.fc35.tar.xz
kernel-5.16.0-0.rc5.20211214git5472f14a3742.36.vanilla.1.fc35.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc5.20211214git5472f14a3742.36.vanilla.1.fc35
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rwxr-xr-xfilter-modules.sh.rhel2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-debug-rhel.config8
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-aarch64-rhel.config10
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config8
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-ppc64le-rhel.config10
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-debug-rhel.config8
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-s390x-rhel.config10
-rw-r--r--kernel-s390x-zfcpdump-rhel.config14
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-debug-rhel.config8
-rw-r--r--kernel-x86_64-fedora.config2
-rw-r--r--kernel-x86_64-rhel.config10
-rwxr-xr-xkernel.spec20
-rw-r--r--sources6
28 files changed, 76 insertions, 72 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2269aac0a..207954f23 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 = 35
+RHEL_RELEASE = 36
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index ea487fbc1..01e2ad83b 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/e92cffb3ade9c9013c04bf608ba1019b393c23ea
- e92cffb3ade9c9013c04bf608ba1019b393c23ea pci.h: Fix static include
+https://gitlab.com/cki-project/kernel-ark/-/commit/90ae29c213c7d8ddba748a01eba059f0a60aec71
+ 90ae29c213c7d8ddba748a01eba059f0a60aec71 pci.h: Fix static include
https://gitlab.com/cki-project/kernel-ark/-/commit/f56e8c23f21528d48b494c2762b7d7674468273d
f56e8c23f21528d48b494c2762b7d7674468273d drivers/pci/pci-driver.c: Fix if/ifdef typo
diff --git a/filter-modules.sh.rhel b/filter-modules.sh.rhel
index 3190b517c..3e22dba11 100755
--- a/filter-modules.sh.rhel
+++ b/filter-modules.sh.rhel
@@ -31,7 +31,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2
usbdrvs="atm image misc serial wusbcore"
-fsdrvs="affs befs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
+fsdrvs="affs befs cifs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 7d937bc65..339dd2630 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2529,7 +2529,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 92753f577..6fc71bece 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -785,7 +785,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1954,7 +1954,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3288,7 +3288,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -4013,7 +4013,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f79b311cc..02d6e79cd 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2513,7 +2513,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 8f2c91d24..56daa7e5f 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -785,7 +785,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1124,7 +1124,7 @@ CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
@@ -1938,7 +1938,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3267,7 +3267,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3991,7 +3991,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 744bf4301..1fb30a623 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2554,7 +2554,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 899f316c2..eadf97ec0 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2539,7 +2539,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f08af6edb..6fe648f32 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2502,7 +2502,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 7b6605ae0..14841c5be 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2487,7 +2487,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index e08732ad0..ecc64fb1c 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2188,7 +2188,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index a5f1d953d..bea7f0258 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2171,7 +2171,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ee2af07d1..c166a321b 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2061,7 +2061,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d025d6a62..f22007e21 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -669,7 +669,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1797,7 +1797,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
# CONFIG_HID_XINMO is not set
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3120,7 +3120,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3817,7 +3817,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 9e5aa65ef..e9f879770 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2044,7 +2044,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index da73d76d1..10b8cf2d7 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -669,7 +669,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -983,7 +983,7 @@ CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
@@ -1781,7 +1781,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
# CONFIG_HID_XINMO is not set
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3102,7 +3102,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3799,7 +3799,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_J721E_HOST is not set
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index ec7cd1d2f..2b61948a9 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2054,7 +2054,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 998a237d3..9be4ac98c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -671,7 +671,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1795,7 +1795,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
@@ -3101,7 +3101,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3795,7 +3795,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_NR_FUNCTIONS=512
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
# CONFIG_PCI_PASID is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index f8453f28c..634053332 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2037,7 +2037,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 855439e99..64b0f7a7e 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -671,7 +671,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -988,7 +988,7 @@ CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
@@ -1779,7 +1779,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
@@ -3083,7 +3083,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3777,7 +3777,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_NR_FUNCTIONS=512
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
# CONFIG_PCI_PASID is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 9c08785d0..ab837e9ec 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -451,7 +451,7 @@ CONFIG_BPF_JIT=y
CONFIG_BPF_LSM=y
# CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_STREAM_PARSER=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -676,7 +676,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -994,7 +994,7 @@ CONFIG_DEBUG_LIST=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
@@ -1789,7 +1789,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
@@ -3097,7 +3097,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3794,7 +3794,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MSI=y
CONFIG_PCI_NR_FUNCTIONS=512
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
# CONFIG_PCI_PASID is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_PF_STUB=m
@@ -6459,7 +6459,7 @@ CONFIG_X86_IOPL_IOPERM=y
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_X86_SGX_KVM=y
-CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_XDP_SOCKETS_DIAG=y
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_BACKEND is not set
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index e0c08ebdd..fc30c2c2b 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2227,7 +2227,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index ee15995e6..7c21ad873 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -694,7 +694,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1916,7 +1916,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3289,7 +3289,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -4001,7 +4001,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index bb2a1e4cc..d709f47fd 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2210,7 +2210,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index ae1ed042f..53fee649c 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -694,7 +694,7 @@ CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_CIFS_FSCACHE is not set
CONFIG_CIFS=m
CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_SMB_DIRECT=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_SWN_UPCALL is not set
CONFIG_CIFS_UPCALL=y
@@ -1045,7 +1045,7 @@ CONFIG_DEBUG_MISC=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
@@ -1900,7 +1900,7 @@ CONFIG_HID_UCLOGIC=m
CONFIG_HID_WACOM=m
CONFIG_HID_WALTOP=m
CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XIAOMI is not set
+CONFIG_HID_XIAOMI=m
CONFIG_HID_XINMO=m
CONFIG_HID=y
CONFIG_HID_ZEROPLUS=m
@@ -3269,7 +3269,7 @@ CONFIG_MT76x0U=m
CONFIG_MT76x2E=m
CONFIG_MT76x2U=m
# CONFIG_MT7915E is not set
-# CONFIG_MT7921E is not set
+CONFIG_MT7921E=m
# CONFIG_MT7921S is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_AFS_PARTS is not set
@@ -3981,7 +3981,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_MESON is not set
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_MSI=y
-# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_P2PDMA=y
CONFIG_PCI_PASID=y
CONFIG_PCIPCWATCHDOG=m
CONFIG_PCI_PF_STUB=m
diff --git a/kernel.spec b/kernel.spec
index a107d1846..976585b15 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc5.35
+%global distro_build 0.rc5.20211214git5472f14a3742.36
%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.rc5.35
+%define pkgrelease 0.rc5.20211214git5472f14a3742.36
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.35%{?buildid}%{?dist}
+%define specrelease 0.rc5.20211214git5472f14a3742.36%{?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-rc5.tar.xz
+Source0: linux-5.16-rc5-10-g5472f14a3742.tar.xz
Source1: Makefile.rhelver
@@ -1385,8 +1385,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc5 -c
-mv linux-5.16-rc5 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc5-10-g5472f14a3742 -c
+mv linux-5.16-rc5-10-g5472f14a3742 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2987,7 +2987,11 @@ fi
#
#
%changelog
-* Mon Dec 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.16-0.rc5.35]
+* Tue Dec 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc5.20211214git5472f14a3742.36]
+- Enable CONFIG_CIFS_SMB_DIRECT for ARK (Ronnie Sahlberg)
+- mt76: enable new device MT7921E in CentOs/RHEL (Íñigo Huguet) [2004821]
+- Disable CONFIG_DEBUG_PREEMPT on normal builds (Phil Auld)
+- redhat/configs: Enable CONFIG_PCI_P2PDMA for ark (Myron Stowe)
- pci.h: Fix static include (Prarit Bhargava)
* Sun Dec 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211212gita763d5a5abd6.34]
diff --git a/sources b/sources
index 2ed9d2e33..3504aeac3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-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
+SHA512 (linux-5.16-rc5-10-g5472f14a3742.tar.xz) = 98d630ac8b1f8093c5b108946651cb970d97b77af8ea19ce1b1b936c37d8627e18d01f7b964e5f01f70b71ebf46707d520bc9c50415a41ee4dcf04dc0be249ba
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc5.20211214git5472f14a3742.36.tar.bz2) = e18a3d7dbb6e339f13ac191f1d96edcf1fd690bab154803e39d5a835e4ab58d612492b2f37d873b510f766a76a915265f44e088c93ee5f9a60a2149e58c98c9c
+SHA512 (kernel-kabi-dw-5.16.0-0.rc5.20211214git5472f14a3742.36.tar.bz2) = 699bd0cefd1df656eebba0f8d297fa4020e159c2d1e3c7cd7e570755ad1db4fc09bbaba504b4b440262e0f8490e41f1cc366d9abc034a230244556aa3beed89b