* John W. Linville <linville@xxxxxxxxxxxxx> [140124 16:03]: > On Fri, Jan 24, 2014 at 10:53:22PM +0100, Sebastian Reichel wrote: > > On Sat, Jan 18, 2014 at 09:47:06AM -0800, Tony Lindgren wrote: > > > [...] > > > > > > The reason was for keeping things building and git bisect working. > > > > > > I do have wl1251-pdata-signed as the base for branch > > > omap-for-v3.14/omap3-board-removal. However the board removal was > > > considered too early for v3.14, so that's been postponed. This is > > > because people are still updating their systems to device tree > > > based booting. So I can redo my omap-for-v3.14/omap3-board-removal > > > against v3.14. > > > > > > So if you want to, feel free to pick all the wl12xx patches to your > > > wireless tree. AFAIK my omap-for-v3.14/omap3-board-removal is the > > > only other user for those patches, and that I can redo that on > > > v3.14. > > > > > > So for the arch/arm/*omap* touching patches, feel free to add: > > > > > > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > > > > Another ping. If this does not go into 3.14 via wireless tree > > it will become complicated for 3.15 again. > > It's too late for new networking features in 3.14. Why wouldn't Tony > send it via his tree? It's mostly drivers/net/wireless related to patch the wl12xx driver further. > At any rate, I don't have the patches. If you still want them through > the wireless tree (for 3.15) then you'll need to resend them. Sebastian, please resend the whole series to John and feel free to add my acks. It's best that John picks them all up, otherwise we'll have the same issue for v3.15. It seems that we should have just taken the merge conflict rather than going back and forth with this. Cheers, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
