From: "John W. Linville" <linville@xxxxxxxxxxxxx> Date: Tue, 18 Nov 2008 19:08:52 -0500 > Here is another big round of updates intended for 2.6.29. This batch is > mostly driver updates as well as a bunch of file movement. Also, some > patches from me are working towards refactoring/minimizing the old > ieee80211 component into a support library for ipw2100 and ipw2200 and > also collecting more code into lib80211 for sharing between more > drivers. > > Please let me know if there are problems! ... > P.S. I have included a merge-test branch as an example of how the > merge conflicts with the wireless-2.6 pull request from today should > be resolved. John, I took the stable fixes and those are in the pull request I just sent to Linus. Once he takes that in I'll merge those bits into net-next-2.6 and resolve the conflicts created solely by that merge. What I think makes sense right now for your net-next-2.6 stuff is for you to just sit tight until I do the merge, then you can respin your tree, include Rami Rosen's build fix, and take care of the remaining merge issues at the same time. I'll post on netdev when I do the merging, as I usually do. Thanks! -- 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
