On Fri, Jul 22, 2011 at 05:04:41PM +0200, Hauke Mehrtens wrote: > On 07/22/2011 03:39 PM, John W. Linville wrote: > > On Fri, Jul 22, 2011 at 10:24:00AM +0200, Hauke Mehrtens wrote: > >> On 07/22/2011 12:30 AM, Rafał Miłecki wrote: > >>> 2011/7/16 Hauke Mehrtens <hauke@xxxxxxxxxx>: > > > >>>> @Ralf: Could you please merger this into the mips tree so that it will be in linux-3.1. > >>> > >>> ML for bcma is linux-wireless. Should we pass that patches "via" Ralf > >>> or John? Using linux-wireless (and John's tree) makes more sense to > >>> me, as we will work on the same tree and will get less merge > >>> conflicts. However don't take me as Linux development style guru, just > >>> my POV. > > > >> I talked about this with Florian Fainelli and he said that the patches > >> should rather pass Ralf then John, but merging would be easier when they > >> are passing John. I do not have a problem with both solutions and > >> rebasing it to an other tree is no problem for me. > >> John and Ralf, who wants to take these patches? ;-) > > > > I don't really care -- I figured Ralf was taking them due to the MIPS arch bits. > > > > John > > Hi John, > > yes because of the MIPS arch bits it should go through Ralf, but there > are many changes for bcma in wireless-testing and adding my changes to > mips tree will cause some problems when wireless-testing and mips are > merged together by Linus. > > Hauke I'm happy to take them if Ralf agrees. You'll need to repost them (or at least send them to me again). John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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