Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819AbaBLVkt (ORCPT ); Wed, 12 Feb 2014 16:40:49 -0500 Received: from mail-ob0-f174.google.com ([209.85.214.174]:62598 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbaBLVkr (ORCPT ); Wed, 12 Feb 2014 16:40:47 -0500 MIME-Version: 1.0 In-Reply-To: <87ppmsauij.fsf@kamboji.qca.qualcomm.com> 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> From: Bjorn Helgaas Date: Wed, 12 Feb 2014 14:40:26 -0700 Message-ID: Subject: Re: [PATCH 1/3] ath10k: Get rid of superfluous call to pci_disable_msi() To: Kalle Valo Cc: Alexander Gordeev , "linux-pci@vger.kernel.org" , linux-wireless , "linux-kernel@vger.kernel.org" , ath10k@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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). And if Alexander re-posts the networking series (I think he might, to add a pci_enable_msix_exact() interface), maybe he can include wil6210 with that series. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/