On Wed, Feb 12, 2014 at 6:38 AM, Alexander Gordeev <agordeev@xxxxxxxxxx> wrote: > On Tue, Feb 11, 2014 at 05:31:43PM -0700, Bjorn Helgaas wrote: >> I haven't put these in my branch, so you can take them. >> >> Alexander has a whole batch of network driver updates that I think David >> Miller is going to apply; would it make sense to include these in that >> batch? >> >> There's also the wil6210 patch for >> drivers/net/wireless/ath/wil6210/pcie_bus.c, which seems like it maybe >> could be in that batch, too. > > 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. I think I need to put the ahci regression fix in v3.14, so I'll move that to my for-linus branch and just keep the other odds and ends (ahci and vfio) for v3.15. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
