Return-path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:10065 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751440AbaBMK3M (ORCPT ); Thu, 13 Feb 2014 05:29:12 -0500 From: Kalle Valo To: Bjorn Helgaas CC: "linux-pci@vger.kernel.org" , Alexander Gordeev , linux-wireless , "linux-kernel@vger.kernel.org" , Subject: Re: [PATCH 1/3] ath10k: Get rid of superfluous call to pci_disable_msi() References: <20140130134819.GA31909@dhcp-26-207.brq.redhat.com> <87y51qohjn.fsf@kamboji.qca.qualcomm.com> <20140204190935.GA1430@dhcp-26-207.brq.redhat.com> <8761oum0l3.fsf@kamboji.qca.qualcomm.com> <20140205085047.GA27820@dhcp-26-207.brq.redhat.com> <871tzilz1u.fsf@kamboji.qca.qualcomm.com> <20140212003143.GD21057@google.com> <20140212133816.GB3147@dhcp-26-207.brq.redhat.com> <87ppmsauij.fsf@kamboji.qca.qualcomm.com> Date: Thu, 13 Feb 2014 12:29:04 +0200 In-Reply-To: (Bjorn Helgaas's message of "Wed, 12 Feb 2014 14:40:26 -0700") Message-ID: <87mwhv9uha.fsf@kamboji.qca.qualcomm.com> (sfid-20140213_112928_033465_AEF308A3) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-wireless-owner@vger.kernel.org List-ID: Bjorn Helgaas writes: > On Wed, Feb 12, 2014 at 2:30 PM, Kalle Valo wrote: >> Bjorn Helgaas writes: >> >>>> Well, as this series is small I thought it could quickly go thru your >>>> tree. But since ipr had conflicts, there is no point routing all patches >>>> altogether, so up to you guys. The wil6210 patch is already in your pci/msi >>>> branch though. >>> >>> It's in pci/msi, but that's not in my -next branch yet, so I can >>> easily drop it. Do drivers/net/wireless patches normally follow a >>> different path than the other drivers/net patches? The wil6210 and >>> ath10k patches look just like the others in the 34-patch series (bnx2, >>> bnx2x, tg3, bna, cxgb3, etc.), so I thought it would make more sense >>> to include them there. >> >> ath10k patches normally go through my ath.git tree to Linville and then >> to David Miller. To avoid conflicts I would prefer to take ath10k >> patches to my tree whenever possible. > > OK, I won't do anything with ath10k (I haven't applied it anywhere). I have now taken the ath10k patches to my pending branch, will apply them soon. -- Kalle Valo