diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 20:01:36 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 20:01:36 +0200 |
commit | 07fd8b8b3b66120a810b984aea06f77681e68b6a (patch) | |
tree | 1624219b2532244918b005925cf7ad523dc8c34a | |
parent | 91f5d14ede5cf81401453a2720c7b23a1a8b4f8a (diff) | |
parent | 84b9af49ccf61cca3fd58645a062be70812db7c1 (diff) | |
download | kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.tar.gz kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.tar.xz kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc29
30 files changed, 137 insertions, 125 deletions
diff --git a/configs/fedora/generic/CONFIG_EXFAT_DEBUG_MSG b/configs/fedora/generic/CONFIG_EXFAT_DEBUG_MSG deleted file mode 100644 index e27d54b29..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DEBUG_MSG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXFAT_DEBUG_MSG is not set diff --git a/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_CODEPAGE b/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_CODEPAGE deleted file mode 100644 index 05eebab75..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_CODEPAGE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 diff --git a/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_IOCHARSET b/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_IOCHARSET deleted file mode 100644 index 6d5b5bd4f..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DEFAULT_IOCHARSET +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" diff --git a/configs/fedora/generic/CONFIG_EXFAT_DELAYED_SYNC b/configs/fedora/generic/CONFIG_EXFAT_DELAYED_SYNC deleted file mode 100644 index c4400e552..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DELAYED_SYNC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXFAT_DELAYED_SYNC is not set diff --git a/configs/fedora/generic/CONFIG_EXFAT_DISCARD b/configs/fedora/generic/CONFIG_EXFAT_DISCARD deleted file mode 100644 index c1e2386aa..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DISCARD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXFAT_DISCARD=y diff --git a/configs/fedora/generic/CONFIG_EXFAT_DONT_MOUNT_VFAT b/configs/fedora/generic/CONFIG_EXFAT_DONT_MOUNT_VFAT deleted file mode 100644 index 605ae55a0..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_DONT_MOUNT_VFAT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXFAT_DONT_MOUNT_VFAT=y diff --git a/configs/fedora/generic/CONFIG_EXFAT_FS b/configs/fedora/generic/CONFIG_EXFAT_FS index e55c7e414..2113d8106 100644 --- a/configs/fedora/generic/CONFIG_EXFAT_FS +++ b/configs/fedora/generic/CONFIG_EXFAT_FS @@ -1 +1 @@ -CONFIG_EXFAT_FS=m +# CONFIG_EXFAT_FS is not set diff --git a/configs/fedora/generic/CONFIG_EXFAT_KERNEL_DEBUG b/configs/fedora/generic/CONFIG_EXFAT_KERNEL_DEBUG deleted file mode 100644 index 364ebe3f9..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_KERNEL_DEBUG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXFAT_KERNEL_DEBUG is not set diff --git a/configs/fedora/generic/CONFIG_HID_CREATIVE_SB0540 b/configs/fedora/generic/CONFIG_HID_CREATIVE_SB0540 new file mode 100644 index 000000000..ce52dd6a4 --- /dev/null +++ b/configs/fedora/generic/CONFIG_HID_CREATIVE_SB0540 @@ -0,0 +1 @@ +# CONFIG_HID_CREATIVE_SB0540 is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_AL b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_AL new file mode 100644 index 000000000..4cfae7f6a --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_AL @@ -0,0 +1 @@ +# CONFIG_PCIE_AL is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194 b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194 new file mode 100644 index 000000000..5484caeef --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194 @@ -0,0 +1 @@ +CONFIG_PCIE_TEGRA194=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U new file mode 100644 index 000000000..23e44783c --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U @@ -0,0 +1 @@ +CONFIG_PHY_TEGRA194_P2U=m @@ -1 +1 @@ -619e17cf75dd58905aa67ccd494a6ba5f19d6cc6 +4c07e2ddab5b6b57dbcb09aedbda1f484d5940cc diff --git a/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch b/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch new file mode 100644 index 000000000..f583a5b2d --- /dev/null +++ b/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch @@ -0,0 +1,87 @@ +From patchwork Tue Sep 24 10:30:57 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Luca Coelho <luca@coelho.fi> +X-Patchwork-Id: 11158395 +X-Patchwork-Delegate: kvalo@adurom.com +Return-Path: <SRS0=l3ON=XT=vger.kernel.org=linux-wireless-owner@kernel.org> +Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org + [172.30.200.123]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62FF3112B + for <patchwork-linux-wireless@patchwork.kernel.org>; + Tue, 24 Sep 2019 10:31:06 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 4AA4E214D9 + for <patchwork-linux-wireless@patchwork.kernel.org>; + Tue, 24 Sep 2019 10:31:06 +0000 (UTC) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S2409468AbfIXKbF (ORCPT + <rfc822;patchwork-linux-wireless@patchwork.kernel.org>); + Tue, 24 Sep 2019 06:31:05 -0400 +Received: from paleale.coelho.fi ([176.9.41.70]:44742 "EHLO + farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org + with ESMTP id S2387644AbfIXKbF (ORCPT + <rfc822;linux-wireless@vger.kernel.org>); + Tue, 24 Sep 2019 06:31:05 -0400 +Received: from [91.156.6.193] (helo=redipa.ger.corp.intel.com) + by farmhouse.coelho.fi with esmtpsa + (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) + (Exim 4.92) + (envelope-from <luca@coelho.fi>) + id 1iCi63-0005Je-8E; Tue, 24 Sep 2019 13:31:03 +0300 +From: Luca Coelho <luca@coelho.fi> +To: kvalo@codeaurora.org +Cc: linux-wireless@vger.kernel.org +Date: Tue, 24 Sep 2019 13:30:57 +0300 +Message-Id: <20190924103057.17147-1-luca@coelho.fi> +X-Mailer: git-send-email 2.23.0 +MIME-Version: 1.0 +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on farmhouse.coelho.fi +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, + URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 +Subject: [PATCH v5.4] iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW + version 36 +Sender: linux-wireless-owner@vger.kernel.org +Precedence: bulk +List-ID: <linux-wireless.vger.kernel.org> +X-Mailing-List: linux-wireless@vger.kernel.org + +From: Luca Coelho <luciano.coelho@intel.com> + +The intention was to have the GEO_TX_POWER_LIMIT command in FW version +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. If we try to send this command to the firmwares that do not +support it, we get a BAD_COMMAND response from the firmware. + +This fixes https://bugzilla.kernel.org/show_bug.cgi?id=204151. + +Cc: stable@vger.kernel.org # 4.19+ +Signed-off-by: Luca Coelho <luciano.coelho@intel.com> +--- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +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; + } diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 9a07f5013..f2341e5c1 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1763,14 +1763,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2139,6 +2132,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m @@ -4408,6 +4402,7 @@ CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y +# CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set @@ -4432,6 +4427,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y # CONFIG_PCIE_ROCKCHIP_HOST is not set +CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y # CONFIG_PCI_FTPCI100 is not set @@ -4532,6 +4528,7 @@ CONFIG_PHY_ROCKCHIP_USB=m CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN6I_MIPI_DPHY=m # CONFIG_PHY_SUN9I_USB is not set +CONFIG_PHY_TEGRA194_P2U=m CONFIG_PHY_TEGRA_XUSB=m # CONFIG_PHY_TUSB1210 is not set CONFIG_PHY_XGENE=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 7931aed2d..72051e2d5 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1755,14 +1755,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2123,6 +2116,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m @@ -4388,6 +4382,7 @@ CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y +# CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set @@ -4412,6 +4407,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y # CONFIG_PCIE_ROCKCHIP_HOST is not set +CONFIG_PCIE_TEGRA194=m CONFIG_PCIE_XILINX_NWL=y CONFIG_PCIE_XILINX=y # CONFIG_PCI_FTPCI100 is not set @@ -4512,6 +4508,7 @@ CONFIG_PHY_ROCKCHIP_USB=m CONFIG_PHY_SUN4I_USB=m CONFIG_PHY_SUN6I_MIPI_DPHY=m # CONFIG_PHY_SUN9I_USB is not set +CONFIG_PHY_TEGRA194_P2U=m CONFIG_PHY_TEGRA_XUSB=m # CONFIG_PHY_TUSB1210 is not set CONFIG_PHY_XGENE=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index e2b0674d4..90a0b781c 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1796,14 +1796,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2166,6 +2159,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 549406bdf..7aa64080e 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1730,14 +1730,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2088,6 +2081,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 02d81a1ab..e81ce01ef 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1723,14 +1723,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2073,6 +2066,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 22b656cc5..9be0ca9d6 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1789,14 +1789,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2151,6 +2144,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 12dd3e156..1f05b59fc 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1519,14 +1519,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1881,6 +1874,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-i686.config b/kernel-i686.config index 9e7f88780..b144dd0bf 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1510,14 +1510,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1864,6 +1857,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 55ca255d2..e6d7451ed 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1377,14 +1377,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1711,6 +1704,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 4220accd1..2f582c550 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1368,14 +1368,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1694,6 +1687,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index da9f45234..df98c9e53 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1385,14 +1385,7 @@ CONFIG_ETHERNET=y # CONFIG_ETHOC is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1706,6 +1699,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-s390x.config b/kernel-s390x.config index fe40ba006..47fc76d4f 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1376,14 +1376,7 @@ CONFIG_ETHERNET=y # CONFIG_ETHOC is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1689,6 +1682,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a54436489..4bae1acb3 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1561,14 +1561,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1918,6 +1911,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e0e393570..c1d53728a 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1552,14 +1552,7 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 -CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -# CONFIG_EXFAT_DELAYED_SYNC is not set -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DONT_MOUNT_VFAT=y -CONFIG_EXFAT_FS=m -# CONFIG_EXFAT_KERNEL_DEBUG is not set +# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1901,6 +1894,7 @@ CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m CONFIG_HID_COUGAR=m CONFIG_HID_CP2112=m +# CONFIG_HID_CREATIVE_SB0540 is not set CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELAN=m diff --git a/kernel.spec b/kernel.spec index b835f7273..35f03b9ca 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -562,11 +562,14 @@ Patch330: arm64-qcom-i2c-geni-Disable-DMA-processing-on-the-Lenovo-Yoga-C630.pat Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch # gcc9 fixes -Patch507: 0001-Drop-that-for-now.patch +Patch502: 0001-Drop-that-for-now.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1701096 # Submitted upstream at https://lkml.org/lkml/2019/4/23/89 -Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch +Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch + +# https://patchwork.kernel.org/patch/11158395/ +Patch504: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch # END OF PATCH DEFINITIONS @@ -1772,6 +1775,9 @@ fi # # %changelog +* Tue Sep 24 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc0.git6.1 +- Linux v5.3-12025-g4c07e2ddab5b + * Mon Sep 23 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc0.git5.1 - Linux v5.3-11768-g619e17cf75dd @@ -1,2 +1,2 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d -SHA512 (patch-5.3-git5.xz) = 073a200643e695fd4ca31e1092fededb8576564ee1af4eca893820967daa2dc838ac536b78bc267777fe932542118218659ec2fdec06e2a680caf2c570b63bcd +SHA512 (patch-5.3-git6.xz) = 1ed91cf910959f4961bb3c9f360af84396067b434e96c669d21675e8677234e9d23eccd5e024f8dac2dadf68763f0ce3adcd409af3809a82d9878d7433e06b39 |