linux-kernel - Re: linux-next: manual merge of the infiniband tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <512C63CA.3050004@mellanox.com>
Date:	Tue, 26 Feb 2013 09:27:06 +0200
From:	Or Gerlitz <ogerlitz@...lanox.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Roland Dreier <roland@...nel.org>, <linux-rdma@...r.kernel.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Hadar Hen Zion <hadarh@...lanox.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Shani Michaeli <shanim@...lanox.com>,
	Haggai Eran <haggaie@...lanox.com>,
	Amir Vadai <amirv@...lanox.com>
Subject: Re: linux-next: manual merge of the infiniband tree with Linus' tree

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@...lanox.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/