From dd58530227f896b342c4c0a0bd0e5ebad1ddd3dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 6 Oct 2019 00:29:44 +0200 Subject: [PATCH] - 5.3.4 --- kernel-small_fixes.patch | 22 +--------------------- kernel.spec | 6 +++--- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index fcb13ed7..a74070e8 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,21 +1 @@ -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -index 014eca6596e2..32a5e4e5461f 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -@@ -889,11 +889,13 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm) - * firmware versions. Unfortunately, we don't have a TLV API - * flag to rely on, so rely on the major version which is in - * the first byte of ucode_ver. This was implemented -- * initially on version 38 and then backported to 36, 29 and -- * 17. -+ * initially on version 38 and then backported to29 and 17. -+ * The intention was to have it in 36 as well, but not all -+ * 8000 family got this feature enabled. The 8000 family is -+ * the only one using version 36, so skip this version -+ * entirely. - */ - return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 || -- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 || - IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 || - IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17; - } +Nothing here for now, move along... diff --git a/kernel.spec b/kernel.spec index 51e94cc0..70971d52 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ %define rel 1 %define basever 5.3 -%define postver .2 +%define postver .4 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -123,7 +123,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: c99feaade8047339528fb066ec5f8a49 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: c385fc0b2e9ee92bb5b5ac841b5c16dc +# Patch0-md5: e9110e2b4d4f48e1142ff3c8e059b8ca %endif Source1: kernel.sysconfig @@ -690,7 +690,7 @@ rm -f localversion-rt %endif # vanilla # Small fixes: -%patch2000 -p1 +#%patch2000 -p1 %patch2001 -p1 #%patch2003 -p1 %patch2004 -p1 -- 2.44.0