Re: Please pull from 'powerpc-next' branch
From: Stephen Rothwell <hidden>
Date: 2008-07-09 17:13:22
Hi Kumar, On Wed, 9 Jul 2008 08:13:03 -0500 (CDT) Kumar Gala [off-list ref] 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"? 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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Attachments
- (unnamed) [application/pgp-signature] 197 bytes