Messages in this thread | | | Date | Thu, 29 Sep 2011 11:15:16 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the moduleh tree |
| |
Hu Paul,
On Wed, 28 Sep 2011 20:15:45 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > > I figured, given the footprint of the module.h stuff, that it is entirely > unfair for you to have to carry all those changes that aren't in the > merge-base of the module.h branch. So I've created a post merge > commit series that I'll maintain -- which will have the commits that > can't be in the module.h split branch, but will be required, once all > the linux-next content has been merged. > > If you clone: > > git://openlinux.windriver.com/people/paulg/modsplit-post-merge > > you will get a repository of commits, and a series file (just like that used > for longterm/stable queues) that you can deploy onto linux-next to get > the changes you'd been carrying, plus new ones I found by testing on > linux-next myself. > > I'm hoping that you can plug pulls of this post-merge queue into your > infrastructure in a way that moves the burden off you and onto me.
OK, that is easy, I will just use your set of patches instead of my set of merge fixups - it just drops in.
Thanks for that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |