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 S932655AbbLGPCw (ORCPT <rfc822;w@1wt.eu>);
	Mon, 7 Dec 2015 10:02:52 -0500
Received: from smtp.codeaurora.org ([198.145.29.96]:55412 "EHLO
	smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S964906AbbLGO7w (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 7 Dec 2015 09:59:52 -0500
From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Vivek Natarajan <nataraja@qti.qualcomm.com>,
        Rajkumar Manoharan <rmanohar@qti.qualcomm.com>,
        linux-wireless@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
References: <20151207141325.1609aec1@canb.auug.org.au>
Date: Mon, 07 Dec 2015 16:59:43 +0200
In-Reply-To: <20151207141325.1609aec1@canb.auug.org.au> (Stephen Rothwell's
	message of "Mon, 7 Dec 2015 14:13:25 +1100")
Message-ID: <87r3iycnj4.fsf@kamboji.qca.qualcomm.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/ath/ath10k/pci.c
>
> between commit:
>
>   6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused")
>
> from Linus' tree and commit:
>
>   afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks, the fix looks good to me.

-- 
Kalle Valo