Return-path: Received: from sabertooth01.qualcomm.com ([65.197.215.72]:32449 "EHLO sabertooth01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549AbaBLVav (ORCPT ); Wed, 12 Feb 2014 16:30:51 -0500 From: Kalle Valo To: Bjorn Helgaas CC: Alexander Gordeev , "linux-pci@vger.kernel.org" , 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> Date: Wed, 12 Feb 2014 23:30:44 +0200 In-Reply-To: (Bjorn Helgaas's message of "Wed, 12 Feb 2014 12:28:00 -0700") Message-ID: <87ppmsauij.fsf@kamboji.qca.qualcomm.com> (sfid-20140212_223113_745852_521D64C2) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-wireless-owner@vger.kernel.org List-ID: 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. -- Kalle Valo