From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, shemminger@vyatta.com, rolandd@cisco.com
Subject: Re: linux-next: manual merge of the net tree with the infiniband tree
Date: Sun, 22 Mar 2009 21:17:20 -0700 (PDT) [thread overview]
Message-ID: <20090322.211720.220979862.davem@davemloft.net> (raw)
In-Reply-To: <20090323145001.6615d77b.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Mar 2009 14:50:01 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
> 574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
> net_device_ops") from the infiniband tree and commit
> fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
> net_device_ops") from the net tree.
>
> Again different versions of the same change. I used the net tree version.
I'll work with Roland to resolve these somehow, thanks.
next prev parent reply other threads:[~2009-03-23 4:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 3:50 linux-next: manual merge of the net tree with the infiniband tree Stephen Rothwell
2009-03-23 4:17 ` David Miller [this message]
2009-03-23 16:36 ` Roland Dreier
2009-03-23 16:42 ` Stephen Hemminger
2009-03-23 19:28 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-03-26 3:27 Stephen Rothwell
2009-03-24 2:31 Stephen Rothwell
2009-03-23 3:49 Stephen Rothwell
2009-03-23 3:49 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090322.211720.220979862.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=rolandd@cisco.com \
--cc=sfr@canb.auug.org.au \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox