"merge" branch reset in powerpc.git tree

Paul Mackerras paulus at samba.org
Fri Jun 23 21:44:58 EST 2006


If you are following the powerpc.git tree, and you pull the "merge"
branch, you will need to reset it to have commit ID
5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
head of the "master" branch and of Linus' linux-2.6 tree at the
moment.

This is because there was a merge between the "master" branch and the
linux-2.6 tree which Linus didn't pull - instead he did a new merge.
The merge I did is now redundant, and needs to be removed to keep the
powerpc and linux-2.6 trees in sync.

Paul.



More information about the Linuxppc-dev mailing list