On Jul 9, 2008, at 12:13 PM, Stephen Rothwell wrote:
Hi Kumar,
On Wed, 9 Jul 2008 08:13:03 -0500 (CDT) Kumar Gala <[EMAIL PROTECTED]
> wrote:
Please pull from 'powerpc-next' branch of
master.kernel.org:/pub/scm/linux/kernel/git/galak/dts.git powerpc-
next
$ git ls-remote ssh://master.kernel.org/pub/scm/linux/kernel/git/galak/dts.git
fatal: '/pub/scm/linux/kernel/git/galak/dts.git': unable to chdir or
not a git archive
fatal: The remote end hung up unexpectedly
Did you mean ".../powerpc.git"?
yes. the script I use was run from the wrong dir.
Also, the master branch of that tree has the same problem I came up
against in linux-next today: include/asm-powerpc/pgtable-ppc64.h
mismerges between Linus' tree and the Paul's tree so you end up with
two
copies of huge_ptep_set_wrprotect. So you should amend the merge to
remove one.
Thanks, will fix up by hand.
- k
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
