[git pull] Please pull powerpc.git merge branch

Linus Torvalds torvalds at linux-foundation.org
Fri Oct 5 02:00:14 EST 2012

On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt
<benh at kernel.crashing.org> wrote:
> First, however, a note about the pull request details ... the diffstat looks
> completely on crack, any idea what's up ? It sees piles of files modified
> in various other archs & generic code but I see no patch in that branch
> that touches any of them.

So this happens if you have "reverse merges" (ie you've pulled my
tree, or some other tree I've pulled), and there is no longer a single
clear common point that you started from. In that case, there is no
simple diff for the "what has changed since that original point", and
to get the diff for the merge you actually have to do the merge and
check the end result. git-request-pull doesn't do that, it just
assumes it's the simple case of some single common point.

The fact that you haven't seen it until now just means that you've
generally done a good job at keeping your powerpc tree "clean" from
other trees, and containing only your own work.


More information about the Linuxppc-dev mailing list