On Mon, May 02, 2011 at 04:35:28PM +0200, Arend van Spriel wrote: > On 05/02/2011 03:58 PM, Greg KH wrote: > >On Mon, May 02, 2011 at 09:48:34AM +0200, Arend van Spriel wrote: > >>On 04/26/2011 01:39 AM, Greg KH wrote: > >>>I'm experiencing so many merge problems with the brcm80211 patches right > >>>now, that I'm giving up and just dropping all of them, even the ones > >>>that I didn't respond to. > >>> > >>>So consider this a reset. Any brcm80211 patch sent to me that I have > >>>not either applied, or responded to, is deleted from my patch queue. > >>>Please rebase on my tree and resend them. > >>> > >>>what a mess... > >>Hi Greg, > >> > >>We are rebasing all dropped patches on you staging-next branch to > >>get out of this mess (agree there is no better word for it :-( ). Do > >>you prefer that we send these 'catch-up' patches in one big patch > >>series (currently I have 34 patches ready to be resubmitted) or do > >>you prefer multiple smaller series (max. 15 or ...)? > >Either is fine with me. > > > >thanks, > > > >greg k-h > > Great. I cleaned up everything and have 60 patches ready to go. I > noticed the last couple of days two or three patches on brcm80211 > sources. Do you intend to apply those first? If so I will wait for > that before sending out my patches. Yes, I think I intend to, should I not? You can always rebase your patches on top of them and then send them to me. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
