netdev - linux-next: manual merge of the target-updates tree with the net-next 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, 9 Feb 2015 19:03:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the target-updates tree with the
 net-next tree

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/vhost/scsi.c between commit 57dd8a0735aa ("vhost:
vhost_scsi_handle_vq() should just use copy_from_user()") from the
net-next tree and commit 09b13fa8c1a1 ("vhost/scsi: Add ANY_LAYOUT
support in vhost_scsi_handle_vq") from the target-updates tree.

I fixed it up (the latter removes the code modified 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