From: Roland Dreier <rdreier@cisco.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, 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: Mon, 23 Mar 2009 09:36:34 -0700 [thread overview]
Message-ID: <adavdq0w60d.fsf@cisco.com> (raw)
In-Reply-To: <20090322.211720.220979862.davem@davemloft.net> (David Miller's message of "Sun, 22 Mar 2009 21:17:20 -0700 (PDT)")
> 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 drop the netdev-ops topic branch from my tree and assume that
Stephen's newer patches are the right ones. Not sure why Stephen sent
two different versions to two different trees but oh well...
next prev parent reply other threads:[~2009-03-23 16:36 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
2009-03-23 16:36 ` Roland Dreier [this message]
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=adavdq0w60d.fsf@cisco.com \
--to=rdreier@cisco.com \
--cc=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