From: Sridhar Samudrala <[EMAIL PROTECTED]>
Date: Fri, 11 Nov 2005 14:00:40 -0800
> Please pull the following SCTP updates from
> master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6.git
I can't pull this cleanly into Linus's current tree, there
are some file level conflicts:
[EMAIL PROTECTED]:~/src/GIT/sctp-2.6$ git pull
master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6.git
[EMAIL PROTECTED]'s password: neb69ish
Packing 41 objects
Unpacking 41 objects
100% (41/41) done
* committish: d1de8a6feef58d4ebc46b638918aa00aab1cd516
master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Traceback (most recent call last):
File "/home/davem/bin/git-merge-recursive", line 8, in ?
from gitMergeCommon import *
File "/home/davem/share/git-core/python/gitMergeCommon.py", line 14, in ?
import subprocess
ImportError: No module named subprocess
Automatic merge failed/prevented; fix up by hand
Can you put these patches into a freshly cloned tree that
I can thus pull cleanly from?
Thanks.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
