Update to 5.5.10rc1-1

3 files changed, 10 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 796f8149c743..17ca0f499aa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-rc
-	pkgver = 5.5.9rc1
+	pkgver = 5.5.10rc1
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -9,14 +9,13 @@ pkgbase = linux-rc
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.9-rc1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.9-rc1.sign
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.8.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.8.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.10-rc1.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.9.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.9.tar.sign
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-	source = 0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
 	source = 0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
 	source = 0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 	source = 0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
@@ -27,14 +26,13 @@ pkgbase = linux-rc
 	source = 0011-drm-i915-Introduce-a-vma.kref.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 4eb5b407e56b35338d621a2a59b554525275bb98ae1a1064ce6c58b7228d7b78
+	sha256sums = b7cbe2c5ef1d471571f7aa7d382fa4de6aa4df9b5b48210fa897ee3886f657b6
 	sha256sums = SKIP
-	sha256sums = e5b6f6938e99a39fb359618e92349ca4e2cd9db31e1b81b7d14d2fa7dc03fc06
+	sha256sums = a435e16950bbe80362495383c2b5e8b78a4b3879c894e2b3c38ecba6fe7ca878
 	sha256sums = SKIP
 	sha256sums = a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868
 	sha256sums = d4412be5c95843577937534051571d852690b01e1e21ffed36c1aeb91e728bcf
 	sha256sums = 83af12e6073856d1557c439c8f96fc14af3ff202e5a2bdeb3fcecb01f0db6672
-	sha256sums = 0e1b524d287a1b7415eab644e4add083f3e2649175af551d0646c81e822c2bb0
 	sha256sums = 92404a0534c5934d73420408707f474b151e2e01e4bbf8ad7141c55274e88aef
 	sha256sums = 83bc4c6d7fdf8b37a3804eef8bb4a6d44302fa2cabea40512859fa956eb78769
 	sha256sums = 6b1d8ec648f4e37d358d369bc2e20072a6d445234580dcfe2320df0dc24087d1
diff --git a/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch b/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
deleted file mode 100644
index 1cff532e1061..000000000000
--- a/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6ba9e64f96ff87b42e77e6deacaa793f5f0e0ce3 Mon Sep 17 00:00:00 2001
-From: Dan Moulding <dmoulding@me.com>
-Date: Tue, 28 Jan 2020 02:31:07 -0700
-Subject: [PATCH 03/12] iwlwifi: mvm: Do not require PHY_SKU NVM section for
- 3168 devices
-
-The logic for checking required NVM sections was recently fixed in
-commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168
-devices"). However, with that fixed the else is now taken for 3168
-devices and within the else clause there is a mandatory check for the
-PHY_SKU section. This causes the parsing to fail for 3168 devices.
-
-The PHY_SKU section is really only mandatory for the IWL_NVM_EXT
-layout (the phy_sku parameter of iwl_parse_nvm_data is only used when
-the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section
-check so that it's only mandatory for IWL_NVM_EXT.
-
-Fixes: b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices")
-Signed-off-by: Dan Moulding <dmoulding@me.com>
----
- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-index 46128a2a9c6e..e98ce380c7b9 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
-@@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
- 		}
- 
- 		/* PHY_SKU section is mandatory in B0 */
--		if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
-+		if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT &&
-+		    !mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
- 			IWL_ERR(mvm,
- 				"Can't parse phy_sku in B0, empty sections\n");
- 			return NULL;
--- 
-2.25.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 78101dc73701..f60a55390a15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.5
 _major=5.5
 ### on initial release this is null otherwise it is the current stable subversion
 ### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=8
+_minor=9
 ### on initial release comment this out and set to =1
 _minorc=$((_minor+1))
 #_minorc=1
@@ -32,7 +32,6 @@ source=(
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch
 0004-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
 0005-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 0006-drm-i915-gem-Take-runtime-pm-wakeref-prior-to-unbind.patch
@@ -46,14 +45,13 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('4eb5b407e56b35338d621a2a59b554525275bb98ae1a1064ce6c58b7228d7b78'
+sha256sums=('b7cbe2c5ef1d471571f7aa7d382fa4de6aa4df9b5b48210fa897ee3886f657b6'
             'SKIP'
-            'e5b6f6938e99a39fb359618e92349ca4e2cd9db31e1b81b7d14d2fa7dc03fc06'
+            'a435e16950bbe80362495383c2b5e8b78a4b3879c894e2b3c38ecba6fe7ca878'
             'SKIP'
             'a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868'
             'd4412be5c95843577937534051571d852690b01e1e21ffed36c1aeb91e728bcf'
             '83af12e6073856d1557c439c8f96fc14af3ff202e5a2bdeb3fcecb01f0db6672'
-            '0e1b524d287a1b7415eab644e4add083f3e2649175af551d0646c81e822c2bb0'
             '92404a0534c5934d73420408707f474b151e2e01e4bbf8ad7141c55274e88aef'
             '83bc4c6d7fdf8b37a3804eef8bb4a6d44302fa2cabea40512859fa956eb78769'
             '6b1d8ec648f4e37d358d369bc2e20072a6d445234580dcfe2320df0dc24087d1'