From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932459AbbBIIDf (ORCPT ); Mon, 9 Feb 2015 03:03:35 -0500 Received: from ozlabs.org ([103.22.144.67]:49726 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932426AbbBIIDd (ORCPT ); Mon, 9 Feb 2015 03:03:33 -0500 Date: Mon, 9 Feb 2015 19:03:26 +1100 From: Stephen Rothwell To: "Nicholas A. Bellinger" , David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro Subject: linux-next: manual merge of the target-updates tree with the net-next tree Message-ID: <20150209190326.374bf38e@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/7zAhT8_=abQGpq/GjFsiRCj"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/7zAhT8_=abQGpq/GjFsiRCj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/7zAhT8_=abQGpq/GjFsiRCj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU2GnTAAoJEMDTa8Ir7ZwVTSYP/20M5y+xB1d+sovpADkAjflW 9y9Yj9bwBzgoe8gwMNhvflqDREh/PlZK+eDg5YmFoO9YK/51DJO1+EmKpmO3b3ZR 3HsuYMnKX0OLemOyDjhVSwPiZt7YkecuZ2x7fsFZnxc4vgtgQcNt1Ypt/Z+qdlw5 wpUsQpMbWtEL3iJGM55m4GDLBFx0T1kvascqh++vdzxJvvvhPziCTpG/0SBwLoFW xS0WjQiP7L83LLGpoDyDNlfpLGOswEuZrpfK5jmzhMLSwQzLjVrAyLH7DV+jqFgi c8ulY0HsSN3LxGCx/TTSHceh/jEhTRtULY5ssR4B/oTWDpvaJJsaIryfQRKjlnu1 pcuahWn0cMnIISUtdxTl96r/SFuJKSciq4jBUtBfb9VYLPaxlWUjlWyTiNh2+lx/ a1/ycChsPm7kUZxvwUqTQYc0EQb7m4DMWyEq8NZjXYGzmCGGF+ISQU5ky7TBjfas vn4kk9OW0jl+a4jAhrUCNfj5qIdJ9UU7r1dka5THO3kpihWRjESDrFpqJgVRu97K YA3MdmWYKf28okoF+c8bTAIICurQKPzoW7z3pyzu8APEucYVbxHdU4HpCgOpoNBN Hm0zrkLH+fJ4jQbjVhIqgnhYI3t4Izt4kfey4J8rg2Q8VKYX8FRYWatSDZEchwXo DH18M9/0gIezI/zeC3uG =eA2q -----END PGP SIGNATURE----- --Sig_/7zAhT8_=abQGpq/GjFsiRCj--