Tony Lindgren <tony@xxxxxxxxxxx> writes: >> I prefer these going through the omap tree. Like Eliad said, >> drivers/net/wireless/ti does not get that many changes nowadays so the >> chances of this patchset conflicting with something is very small. > > OK great. In that case no need to rearrange the patches, I can > apply them into an immutable branch once the pending issues have > been fixed if Kalle acks them. > > To avoid merge conflicts that branch is easiest done against > v4.0-rc4. Kalle and Arnd, does that work for you guys? > > I can also base it on 5b7610f23562 ("ARM: OMAP2+: Fix wl12xx on > dm3730-evm with mainline u-boot") that's on top of -rc2 plus few > other fixes now merged to -rc4 mainline if we need a branch based > on an earlier tag. Sorry, it seems I forgot to answer this one: Either baseline is good for me, I can't think of any problems with either one. But please do remember that I'm a new maintainer, I might very well miss something ;) -- Kalle Valo -- 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