lkml.org 
[lkml]   [2015]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-02-09 09:21    [W:0.042 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site