From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00C3CC43381 for ; Wed, 20 Mar 2019 15:40:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1C372186A for ; Wed, 20 Mar 2019 15:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553096457; bh=3Vpq10PuIhXA1mGS65mWaaqtqLipcX22Lm2tWPMY5UY=; h=Subject:To:Cc:From:Date:List-ID:From; b=bHhvQX6GoB5zvKG8KNqY70Z9RmHytLMmvVhY5STQN+wJpms6yvq+5QTV6lo6JCbLe GBt6OmSdic9gu/a6NEugGYepSORSSYgeINZ8Wc2AqjbelldLuvJQgrr8GxAoz57Wiu i5zy5pCEcbddWp/v5IXAVqVhAyqcG5wc4vX/1mKc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725988AbfCTPk5 (ORCPT ); Wed, 20 Mar 2019 11:40:57 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:32923 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726803AbfCTPk5 (ORCPT ); Wed, 20 Mar 2019 11:40:57 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id B9B8522AB6; Wed, 20 Mar 2019 11:40:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 20 Mar 2019 11:40:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=l+aw5y wYrYLkXmBwPzoMb+aT3Nr2F4yvMaFFhqEUts8=; b=Hr9hdnQsfkjEyhhEnbIGW2 DCGim00tQCwhsV8scEUTFj1xHGe4nNMzMy+wRMr7nrTlXer2+tXCEgA7lRBlz8Un pUemVQDAiup7XQaHLWyzBoHL/hfp/c/jk00fzEcJubAhBIq5reQOYL9haCegA5qS AgNqGFeSv4NgvSQp+ZNmE6O1GYL5X3IGOu7cCP2Os4g/twiS+RihXQLU7wJ+jjjT +mutUOBAaeEVjZnKbPsZ7RedAjDWH+r8M2sg4T0SR7ct6b1C4gFwmvObf3veA5jr JEjGI4HNLyu2B6x1dBBf6i+OsLAXU/o0uXU+9H3YBX3lVtvDIEh3BTVlK8mk1BoA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrieeigdejlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpeej X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 0C9FEE471F; Wed, 20 Mar 2019 11:40:55 -0400 (EDT) Subject: FAILED: patch "[PATCH] iwlwifi: add new card for 9260 series" failed to apply to 4.14-stable tree To: ihab.zhaika@intel.com, luciano.coelho@intel.com, stable@vger.kernel.org Cc: From: Date: Wed, 20 Mar 2019 16:40:44 +0100 Message-ID: <1553096444246106@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3941310cf665b8a7965424d2a185c80782faa030 Mon Sep 17 00:00:00 2001 From: Ihab Zhaika Date: Mon, 4 Feb 2019 10:16:03 +0200 Subject: [PATCH] iwlwifi: add new card for 9260 series Add one PCI ID for 9260 series. CC: # 4.14+ Signed-off-by: Ihab Zhaika Signed-off-by: Luca Coelho diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index b839a921cec8..fb7a0def9355 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -597,6 +597,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x4010, iwl9260_2ac_160_cfg)}, + {IWL_PCI_DEVICE(0x2526, 0x4018, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_160_cfg_soc)},