Jeff Kirsher wrote:
The following patches were diff'd against Garzik's latest 'master' branch and
can be pulled from the following location:
git://198.78.49.142/linux-2.6.git e1000-upstream
Since (per current thread) I'm pulling everything into #upstream, I
apologize for asking you to split it up, which turned out to be needless
work.
I tried pulling the above into current 2.6.16-rc5-gitX (current vanilla
linux-2.6.git tree), and got the following conflict:
[EMAIL PROTECTED] netdev-2.6]$ git checkout -f -b e1000-tmp master
[EMAIL PROTECTED] netdev-2.6]$ git pull git://198.78.49.142/linux-2.6.git
e1000-upstream
Unpacking 131 objects
100% (131/131) done
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 936a5b4c8d81be69160d7d56af4143a03e4fa7ba
Merging:
c499ec24c31edf270e777a868ffd0daddcfe7ebd [PATCH] reiserfs: do not check if
unsigned < 0
936a5b4c8d81be69160d7d56af4143a03e4fa7ba e1000: Added driver comments and
whitespace changes. Modified long lines of code to ensure they would not wrap
beyond 80 characters.
found 1 common ancestor(s):
bd71c2b17468a2531fb4c81ec1d73520845e97e1 Linux v2.6.16-rc4
Auto-merging drivers/net/e1000/e1000.h
Auto-merging drivers/net/e1000/e1000_main.c
CONFLICT (content): Merge conflict in drivers/net/e1000/e1000_main.c
Automatic merge failed; fix up by hand
So, I'll ask you guys to fix up your tree to apply without conflicts to
the latest git, and then resubmit the push. You don't have to resend
all 19 patches, I've reviewed and approved those already.
Jeff
-
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
