All of lore.kernel.org
 help / color / mirror / Atom feed
From: Or Gerlitz <ogerlitz@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roland Dreier <roland@kernel.org>,
	linux-rdma@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Hadar Hen Zion <hadarh@mellanox.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Shani Michaeli <shanim@mellanox.com>,
	Haggai Eran <haggaie@mellanox.com>,
	Amir Vadai <amirv@mellanox.com>
Subject: Re: linux-next: manual merge of the infiniband tree with Linus' tree
Date: Tue, 26 Feb 2013 09:27:06 +0200	[thread overview]
Message-ID: <512C63CA.3050004@mellanox.com> (raw)
In-Reply-To: <20130226114508.0f8d1101156f9f4a309579f6@canb.auug.org.au>

On 26/02/2013 02:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the infiniband tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
> ("net/mlx4_core: Use firmware driven flow steering hash mode") from
> Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
> {INIT, QUERY}_HCA") from the infiniband tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>

thanks,

Acked-by: Or Gerlitz <ogerlitz@mellanox.com>

WARNING: multiple messages have this Message-ID (diff)
From: Or Gerlitz <ogerlitz@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roland Dreier <roland@kernel.org>, <linux-rdma@vger.kernel.org>,
	<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Hadar Hen Zion <hadarh@mellanox.com>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
	Shani Michaeli <shanim@mellanox.com>,
	Haggai Eran <haggaie@mellanox.com>,
	Amir Vadai <amirv@mellanox.com>
Subject: Re: linux-next: manual merge of the infiniband tree with Linus' tree
Date: Tue, 26 Feb 2013 09:27:06 +0200	[thread overview]
Message-ID: <512C63CA.3050004@mellanox.com> (raw)
In-Reply-To: <20130226114508.0f8d1101156f9f4a309579f6@canb.auug.org.au>

On 26/02/2013 02:45, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the infiniband tree got a conflict in
> drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
> ("net/mlx4_core: Use firmware driven flow steering hash mode") from
> Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
> {INIT, QUERY}_HCA") from the infiniband tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>

thanks,

Acked-by: Or Gerlitz <ogerlitz@mellanox.com>

  reply	other threads:[~2013-02-26  7:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-26  0:45 linux-next: manual merge of the infiniband tree with Linus' tree Stephen Rothwell
2013-02-26  0:45 ` Stephen Rothwell
2013-02-26  0:45 ` Stephen Rothwell
2013-02-26  7:27 ` Or Gerlitz [this message]
2013-02-26  7:27   ` Or Gerlitz
  -- strict thread matches above, loose matches on Subject: below --
2015-02-18  0:29 Stephen Rothwell
2014-12-16  1:41 Stephen Rothwell
2014-10-15  0:46 Stephen Rothwell
2013-02-22  0:50 Stephen Rothwell
2013-02-22  0:50 ` Stephen Rothwell
2013-02-22 12:06 ` Or Gerlitz
2012-09-28  1:13 Stephen Rothwell
2012-07-09  2:04 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=512C63CA.3050004@mellanox.com \
    --to=ogerlitz@mellanox.com \
    --cc=amirv@mellanox.com \
    --cc=davem@davemloft.net \
    --cc=hadarh@mellanox.com \
    --cc=haggaie@mellanox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=roland@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shanim@mellanox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.