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

Jon Loeliger linuxppc at
Thu Sep 29 12:07:35 EST 2005

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.

I haven't got a clue where you guys are headed with this code.
Any chance of having Ben or Paul taking a quick peek at it?

Or maybe silently send me the "Don't be dumb; do this..." mail? :-)


More information about the Linuxppc64-dev mailing list