On Fri, Mar 24, 2006 at 01:13:12PM -0800, Pete Zaitcev wrote: > Would you just keep it on master without pushing to Linus? They way you > manipulate branches of wireless-2.6 is bewildering for me, and "softmac"
I'm trying to get away from excessive branching. It gets to be a big PITA, and it confuses people (sometimes including me). That's why I separated the dscape branch out to wireless-dev. I think you have a point. I'll ditch the "devel" branch and just use the "master" branch for the unmerged stuff, while the merge candidate stuff will go in the "upstream" branch for Jeff to pull. Andrew will probably like that better for -mm as well. I should be able to take the master-based patches you sent me and massage them into wireless-2.6 -- no need for you to do it. I apologize for the confusion! John -- John W. Linville [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
