Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora

3 files changed, 14 insertions, 27 deletions

diff --git a/kernel.spec b/kernel.spec
index ee287f07d..7b0e83f8f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -550,7 +550,7 @@ Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
 %if 0%{?fedora}
-ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
+ExclusiveArch: noarch x86_64 s390x %{arm} aarch64 ppc64le
 %else
 ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
 %endif
@@ -2963,16 +2963,16 @@ fi
 #
 #
 %changelog
-* Sun Sep 12 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.3-300]
-- Linux v5.14.3
+* Wed Sep 15 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.4-300]
+- Build kernel-doc for Fedora (Justin M. Forbes)
 
-* Wed Sep 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.2-300]
+* Wed Sep 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.3-300]
 - Revert "team: mark team driver as deprecated" (Justin M. Forbes)
 
-* Fri Sep 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.1-300]
+* Fri Sep 03 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.2-300]
 - Setup for building fedora-5.14 branch (Justin M. Forbes)
 
-* Mon Aug 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14-0]
+* Mon Aug 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.1-300]
 - iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes)
 - arm64: use common CONFIG_MAX_ZONEORDER for arm kernel (Mark Salter)
 - Create Makefile.variables for a single point of configuration change (Justin M. Forbes)
diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch
index 605a1886e..027cd1137 100644
--- a/patch-5.14-redhat.patch
+++ b/patch-5.14-redhat.patch
@@ -22,7 +22,6 @@
  drivers/input/rmi4/rmi_driver.c                    | 124 +++--
  drivers/iommu/iommu.c                              |  22 +
  drivers/net/wireguard/main.c                       |   6 +
- drivers/net/wireless/intel/iwlwifi/pcie/drv.c      |   1 +
  drivers/pci/quirks.c                               |  24 +
  drivers/usb/core/hub.c                             |   7 +
  fs/xfs/xfs_super.c                                 |   8 -
@@ -52,7 +51,7 @@
  tools/testing/selftests/bpf/progs/linked_maps2.c   |  76 ---
  tools/testing/selftests/bpf/progs/linked_vars1.c   |  54 --
  tools/testing/selftests/bpf/progs/linked_vars2.c   |  55 ---
- 54 files changed, 656 insertions(+), 1495 deletions(-)
+ 53 files changed, 655 insertions(+), 1495 deletions(-)
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
 index 2fb7012c3246..47718b4f2f75 100644
@@ -141,10 +140,10 @@ index a9e2c7295b35..6ff11f3a2d47 100644
  /*
   * DIAG 308 support
 diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 50e2c21e0ec9..5da0c683df8d 100644
+index 911cd3912351..caae31c04561 100644
 --- a/arch/s390/kernel/ipl.c
 +++ b/arch/s390/kernel/ipl.c
-@@ -2218,3 +2218,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2215,3 +2215,8 @@ int ipl_report_free(struct ipl_report *report)
  }
 
  #endif
@@ -154,7 +153,7 @@ index 50e2c21e0ec9..5da0c683df8d 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index ff0f9e838916..557318323664 100644
+index ee23908f1b96..0273125cdfba 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
 @@ -49,6 +49,7 @@
@@ -165,7 +164,7 @@ index ff0f9e838916..557318323664 100644
  #include <linux/hugetlb.h>
 
  #include <asm/boot_data.h>
-@@ -1023,6 +1024,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1030,6 +1031,9 @@ void __init setup_arch(char **cmdline_p)
 
  	log_component_list();
 
@@ -1282,18 +1281,6 @@ index 75dbe77b0b4b..4bd6dd722f44 100644
  	ret = wg_allowedips_slab_init();
  	if (ret < 0)
  		goto err_allowedips;
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-index 0b8a0cd3b652..6f49950a5f6d 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-@@ -558,6 +558,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
- 	IWL_DEV_INFO(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),
- 	IWL_DEV_INFO(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),
- 	IWL_DEV_INFO(0xA0F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),
-+	IWL_DEV_INFO(0xA0F0, 0x6074, iwl_ax201_cfg_qu_hr, NULL),
- 	IWL_DEV_INFO(0x02F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL),
- 	IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL),
- 	IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL),
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 index 7b1c81b899cd..5904ece27f64 100644
 --- a/drivers/pci/quirks.c
diff --git a/sources b/sources
index c1323b049..38a8c17fa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.3.tar.xz) = 7926aed288b696d912de9b758fdb2fef222649dd8c5389f3c43bfb39fbe9850f6b44b84e3da1f34d47f7276b8d3633438bd0b19c66fa8f8cd87ecfd6345a65dd
-SHA512 (kernel-abi-stablelists-5.14.3-300.tar.bz2) = 2247682863a210e429db5e0483a25ec7504a9a711574d5c34a3d5cd42c735774fa6dd579b3627bee9a71ac73431b64526d43824a68330ac67d36e1b58b345efa
-SHA512 (kernel-kabi-dw-5.14.3-300.tar.bz2) = fc6a63d92e1bd593e22e916ba0278e8900fe67f8aa97c0516fd159350012878cede9f625ecb5d2933ad02bca3e9984f4bae4f7e1b8ba2e59744f81c7c40e0ac4
+SHA512 (linux-5.14.4.tar.xz) = 4d2e732a2bc1e9ebd962e4a4df03b11475ef13e7415c12459d630a39326cfcc22430583f95a30ba8a5130f9c95b5d5ef25c83210f66bdfb0c8437d78b0e994c3
+SHA512 (kernel-abi-stablelists-5.14.4-300.tar.bz2) = 9fc0900f7f95d00e3dda641ecf025fcda39cbbaeda99b10b89d49157d23c3aaab05deef8028163a484d98be1048e3f2c2bb4742b13c30d6d54b7108ec878325e
+SHA512 (kernel-kabi-dw-5.14.4-300.tar.bz2) = 885092cdaa24561d3e1d26a8a0d8eeec5b8663b0fca4c22c8b4db2feecac87e85e0b34fec6330abcb5489333ed6c654badf2647a178a2be8860fc6c51907cc48