linux-next: manual merge of the 4xx tree with the powerpc tree

Stephen Rothwell sfr at canb.auug.org.au
Fri Dec 9 12:51:16 EST 2011


Hi Josh,

On Thu, 8 Dec 2011 20:46:39 -0500 Josh Boyer <jwboyer at gmail.com> wrote:
>
> I blame BenH.  I sent him a pull request with d5b9ee7b514e in it
> before he went and updated his tree.  Still not pulled afaik.  Guess
> I'll be rebasing my next branch tomorrow to pick up a series from Tony
> Breeds, unless Ben handles the outstanding pull before I wake up :).

Don't bother rebasing, let Ben handle the conflict in the merge.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20111209/4c0d99e4/attachment.pgp>


More information about the Linuxppc-dev mailing list