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
| ||
|
Message-Id: <201207161134.34574.jackm@dev.mellanox.co.il> Date: Mon, 16 Jul 2012 11:34:34 +0300 From: Jack Morgenstein <jackm@....mellanox.co.il> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Hadar Hen Zion <hadarh@...lanox.co.il>, Or Gerlitz <ogerlitz@...lanox.com>, Roland Dreier <roland@...nel.org>, linux-rdma@...r.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the infiniband tree On Thursday 12 July 2012 05:13, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > include/linux/mlx4/device.h between commit 396f2feb05d7 ("mlx4_core: > Implement mechanism for reserved Q_Keys") 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 fixed it up (see below) and can carry the fix > as necessary. Thanks, Stephen! Your merge looks fine. Ack. -Jack -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists