From: Per Liden <[EMAIL PROTECTED]>
Date: Wed, 8 Mar 2006 11:18:15 +0100 (CET)
> Here is a set of patches for net-2.6.17.
>
> Please pull from:
>
> git://tipc.cslab.ericsson.net/pub/git/tipc.git
Looks good, but I can't pull it cleanly.
Please fix this up, thanks.
[EMAIL PROTECTED]:~/src/GIT/net-2.6.17$ git pull
git://tipc.cslab.ericsson.net/pub/git/tipc.git
Unpacking 1382 objects
100% (1382/1382) done
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 387f290cb34ad2d791ced01614ba7062cbcac879
Merging:
6976152167aec234b7b2421a10acc404e3ec8381 [ATM]: Fix build after
neigh->parms->neigh_destructor change.
387f290cb34ad2d791ced01614ba7062cbcac879 [TIPC] reduce stack usage
found 1 common ancestor(s):
e0a5c57848f7690a247bb8af4fa412844b0b00bb Merge branch 'upstream-fixes' of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Renaming net/{ipv4/netfilter/ipt_policy.c => netfilter/xt_policy.c}
Auto-merging net/netfilter/xt_policy.c
Auto-merging include/linux/pci_ids.h
Auto-merging drivers/net/tg3.c
CONFLICT (content): Merge conflict in drivers/net/tg3.c
Automatic merge failed; fix up by hand
-
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
