linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Fri, 22 Feb 2013 11:50:21 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Roland Dreier <roland@...nel.org>, linux-rdma@...r.kernel.org
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Pirko <jiri@...nulli.us>,
	"David S. Miller" <davem@...emloft.net>,
	Yan Burman <yanb@...lanox.com>,
	Or Gerlitz <ogerlitz@...lanox.com>
Subject: linux-next: manual merge of the infiniband tree with Linus' tree

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4
("ethtool: fix drvinfo strings set in drivers") from the  tree and commit
4b48680b5572 ("IPoIB: Add version and firmware info to ethtool
reporting") from the infiniband tree.

I fixed it up (using the latter version as it included the change to use
strlcpy) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped