linux-next: manual merge of the target-updates tree with the net-next tree
From: Stephen Rothwell
Date: Mon Feb 09 2015 - 03:03:37 EST
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).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature