Re: linux-next: manual merge of the moduleh tree with the arm tree

[Stephen Rothwell]

Hi Paul,

On Thu, 25 Aug 2011 18:40:54 -0400 Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> wrote:
>
> OK.  I was entertaining feeding some of the really obvious and simple
> parts of the moduleh branch out to the various maintainers just to
> reduce its overall size, but in the end I guess that just makes work
> for me and them -- vs. a single pull request to Linus for addition to
> v3.2-rc1.   I'll just stay the course and Stephen will have to rerere
> the merge conflict resolution for a while -- something I'm certain
> that he has automated long long ago.

Yeah, that's fine.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature