From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751902AbdLSTGQ (ORCPT <rfc822;w@1wt.eu>);
        Tue, 19 Dec 2017 14:06:16 -0500
Received: from shards.monkeyblade.net ([184.105.139.130]:55138 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750798AbdLSTGP (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 19 Dec 2017 14:06:15 -0500
Date: Tue, 19 Dec 2017 14:06:13 -0500 (EST)
Message-Id: <20171219.140613.787406975531411549.davem@davemloft.net>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, luciano.coelho@intel.com
Subject: Re: pull-request: wireless-drivers-next 2017-12-18
From: David Miller <davem@davemloft.net>
In-Reply-To: <874looktmz.fsf@kamboji.qca.qualcomm.com>
References: <874looktmz.fsf@kamboji.qca.qualcomm.com>
X-Mailer: Mew version 6.7 on Emacs 25.3 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Tue, 19 Dec 2017 11:06:15 -0800 (PST)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 18 Dec 2017 16:17:24 +0200

> a pull request for 4.16 to net-next tree. This is a big one, but on the
> other hand most of the stuff here has been some time on linux-next so
> hopefully there are no nasty surprises. Even though Arnd just send a
> patch[1] five minutes ago about fixing a wcn36xx build warning, but I
> don't think that's critical enough to hold up this, so I'll send it to
> you in the next pull request.
> 
> But this time we actually have a merge conflict due to a000 hardware
> rename in iwlwifi:
> 
> CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> 
> The fix is quite straightforward, take the 22000 versions and manually
> add an entry for 0xA0F0 device:
> 
> {IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl22000_2ax_cfg_hr)},
> 
> I put the 'git diff' output of my test resolution below, hopefully it
> helps. I'll also Cc Luca so he can correct any mistakes I did :)
> 
> Please let me know if you have any problems.

Pulled, and thanks for the resolution diff.  It helped a lot.