Re: : Networking

Forgot to cc: git@vger when I sent this originally.

On Tue, Apr 26, 2005 at 12:57:25AM -0700, Andrew Morton wrote:

Both Linus and DaveM merged the same patch from Al Viro, but they are ofcourse different commits. So both branches have diverged and would need to be merged, where someone decides if Linus's commit or Dave's commit should be used.

Well, I looked at the history, and if I skip the Viro patch in davem's branch by hand I get,

$ git diff -r 25ee7e3832951cf5896b194f6cd929a44863f419:088dd3a45fdb8fb726cd50575856562c4f6f1c3e | diffstat 
 drivers/net/tg3.c                            |   73 ++++++++++++++-------------
 net/ipv4/ip_output.c                         |    2 
 net/ipv4/netfilter/ip_conntrack_ftp.c        |    4 -
 net/ipv4/netfilter/ip_conntrack_standalone.c |    7 --
 net/ipv4/tcp_input.c                         |    1 
 net/sched/simple.c                           |   18 ------
 6 files changed, 46 insertions(+), 59 deletions(-)

So now, how to do this without picking through the logs. I figured the patchutils stuff might have a solution for this. So I got the diffs on Linus's branch wrt to the gca, and from Dave's branch wrt to the gca.

$ git diff -r 25ee7e3832951cf5896b194f6cd929a44863f419:b453257f057b834fdf9f4a6ad6133598b79bd982 > git-linus.patch
$ git diff -r 25ee7e3832951cf5896b194f6cd929a44863f419:5523662c4cd585b892811d7bb3e25d9a787e19b3 > git-net.patch
$ interdiff --no-revert-omitted -p1 git-linus.patch git-net.patch | diffstat
 drivers/net/tg3.c                            |   73 ++++++++++++++-------------
 net/ipv4/ip_output.c                         |    2
 net/ipv4/netfilter/ip_conntrack_ftp.c        |    4 -
 net/ipv4/netfilter/ip_conntrack_standalone.c |    7 --
 net/ipv4/tcp_input.c                         |    1 
 net/sched/simple.c                           |   18 ------
 6 files changed, 46 insertions(+), 59 deletions(-)

That looks like it matched.

Jan