From: Jack Morgenstein <jackm@dev.mellanox.co.il>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Roland Dreier <roland@kernel.org>,
linux-rdma@vger.kernel.org,
Hadar Hen Zion <hadarh@mellanox.co.il>,
Or Gerlitz <ogerlitz@mellanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the infiniband tree
Date: Mon, 16 Jul 2012 11:33:16 +0300 [thread overview]
Message-ID: <201207161133.16886.jackm@dev.mellanox.co.il> (raw)
In-Reply-To: <20120712120950.223be053857381046b7d5db6@canb.auug.org.au>
On Thursday 12 July 2012 05:09, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3
> ("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct
> and paravirtualize them") from the infiniband tree and commit
> 0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware
> API") from the net-next tree.
>
> Just context changes (I think). I have fixed it up (see below) and can
> carry the fix as necessary.
Thanks, Stephen!
Ack for IB side.
-Jack
next prev parent reply other threads:[~2012-07-16 8:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 2:09 linux-next: manual merge of the net-next tree with the infiniband tree Stephen Rothwell
2012-07-12 12:59 ` Hadar Hen Zion
2012-07-16 8:33 ` Jack Morgenstein [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-18 3:18 Stephen Rothwell
[not found] ` <20130418131843.bfeb6b1ad5fba1b0f706076e-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-24 17:53 ` Thadeu Lima de Souza Cascardo
[not found] ` <20130424175304.GA701-kqNz3JI7O+u3AZEqMmYM8VaTQe2KTcn/@public.gmane.org>
2013-04-26 3:50 ` Stephen Rothwell
2012-11-27 0:47 Stephen Rothwell
2012-11-27 6:43 ` Or Gerlitz
2012-07-12 2:13 Stephen Rothwell
2012-07-12 12:57 ` Hadar Hen Zion
2012-07-16 8:34 ` Jack Morgenstein
2012-04-24 2:06 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=201207161133.16886.jackm@dev.mellanox.co.il \
--to=jackm@dev.mellanox.co.il \
--cc=davem@davemloft.net \
--cc=hadarh@mellanox.co.il \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=roland@kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).