On Thu, Oct 31, 2013 at 5:34 PM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > On Mon, 2013-10-21 at 19:22 +0200, Luis R. Rodriguez wrote: >> John, Johannes, >> >> This series addresses consolidating passive-scan and no-ibss flags. >> Since its crosses over drivers I'll let you guys decide what tree >> this goes into. > > Alright, I've applied this, but in one single big patch, and I've redone > (most of) the driver updates using spatch. > > There were conflicts applying the patch, so most likely John will get > conflicts when merging my tree. I've added the spatches to the commit > log so that should be easy to resolve. Oh I love to hear merge conflict issues are being addressed with Coccinelle, thanks for the update. I should have just provided the SmPL for it in the first place ;) -- my bad. Luis -- 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
