linux-kernel - linux-next: manual merge of the target-updates tree with the infiniband 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>] [day] [month] [year] [list]

Date:	Mon, 20 Apr 2015 14:29:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>,
	Roland Dreier <roland@...nel.org>, linux-rdma@...r.kernel.org
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Doug Ledford <dledford@...hat.com>,
	Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the target-updates tree with the
 infiniband tree

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/infiniband/ulp/srpt/ib_srpt.c between commit 9f5d32af09b9
("ib_srpt: convert printk's to pr_* functions") from the infiniband
tree and commit 9ac8928e6a3e ("target: simplify the target template
registration API") from the target-updates tree.

I fixed it up (the latter removed some of the code updated by the
former) 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