Merge conflicts in ppc64/mm/{hash_native.c,tlb.c}

Paul Mackerras paulus at
Thu Sep 29 13:39:16 EST 2005

Jon Loeliger writes:

> So both linux-2.6 top-of-GIT and Paul's merge tree top-of-GIT
> have applied different changes to ppc64/mm/{hash_native.c,tlb.c}
> within hours of each other.  With the net result that a pull
> of linus' tree followed by a pull of Paul's merge tree yields
> Git merge conflicts.

Ben's hugepage fixes clashed with Ben's virtual-addr-in-batch patch.
I have done the merge and resolved the conflict and pushed it out.  It
should be on soon.


More information about the Linuxppc64-dev mailing list