From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 680A5138350 for ; Wed, 18 Mar 2020 15:25:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92780E09E7; Wed, 18 Mar 2020 15:24:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76E8CE09E7 for ; Wed, 18 Mar 2020 15:24:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DB9234F25F for ; Wed, 18 Mar 2020 15:24:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB52D2B for ; Wed, 18 Mar 2020 15:24:56 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1584545076.71d46599cec09c88bb82c46b9707dea4d507e716.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:5.5 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 71d46599cec09c88bb82c46b9707dea4d507e716 X-VCS-Branch: 5.5 Date: Wed, 18 Mar 2020 15:24:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea64dd55-24dc-4ded-bc9c-05b55abc4c4b X-Archives-Hash: 6770bfafe46117512494134c4d1c0102 commit: 71d46599cec09c88bb82c46b9707dea4d507e716 Author: Mike Pagano gentoo org> AuthorDate: Wed Mar 18 15:24:36 2020 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed Mar 18 15:24:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=71d46599 Remove redundant patch Removed: 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 ---- 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/0000_README b/0000_README index d6be20e..9c4285d 100644 --- a/0000_README +++ b/0000_README @@ -95,10 +95,6 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 -Patch: 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch -From: https://patchwork.kernel.org/patch/11353871/ -Desc: iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices - Patch: 2600_enable-key-swapping-for-apple-mac.patch From: https://github.com/free5lot/hid-apple-patched Desc: This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902 diff --git a/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch b/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch deleted file mode 100644 index d736a9e..0000000 --- a/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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;