On Sun, 2013-11-24 at 21:54 +0100, Johannes Berg wrote: > John, > > were you planning to pull 3.13-rc1 into wireless.git? Same question for wireless-next btw, but I think you should definitely pull it in there for the genetlink changes I made through the net tree recently. Otherwise we'll get conflicts in nl80211 for everything. In fact even in wireless.git I believe we'd get conflicts but those are less interesting (some bug fixes I have pending conflict slightly with the genl changes). johannes -- 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
