From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754897AbbDIIHi (ORCPT ); Thu, 9 Apr 2015 04:07:38 -0400 Received: from ozlabs.org ([103.22.144.67]:57059 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751862AbbDIIHc (ORCPT ); Thu, 9 Apr 2015 04:07:32 -0400 Date: Thu, 9 Apr 2015 18:07:19 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Joseph Kogut , Felipe Balbi Subject: linux-next: manual merge of the vhost tree with the usb tree Message-ID: <20150409180719.2eee7e59@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_/Ho=k.9lf.Wtm=c5XNC3Os0q"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Ho=k.9lf.Wtm=c5XNC3Os0q Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/usb/dwc3/dwc3-pci.c between commit adf9c3c85615 ("usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h") from the usb tree and commit 3d4e078e29d3 ("usb/dwc3: comment update") from the vhost tree. I fixed it up (they both removed the same line - the former removed another line as well) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/Ho=k.9lf.Wtm=c5XNC3Os0q Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVJjNAAAoJEMDTa8Ir7ZwVYlsP/RzLwLaaPt6LimfMtB2M9qzr nkkx+wxdQqR4P0S/covzkenPADzfbZAdxYRiqGFJ9pVlM0FInrEe8eKl7R7bBbql PMArsxgRsTw2A05TBhm1KZFsjYoUUdOrsy+UvC2RMHa4XAAkOcJDDxBJXi66Zk6t KkuHrnbfN8vOhc+l63MVjW4HxschcnKjSn83pAIua2sdk0SuvBIb77nmcBg0OvhA R+Mvr0ccLG9+/BDFtEa79jxmEbQJB//h0o5ww3kswSTfeaeITt/vXZdIGhRhBOeQ SmrbTTkVq+FGdvEBYOkzR+TFv2bUrY+H2NuSSSODg6+sTnt4gdG1dESObAUqVDA5 3W55ka+wdmclNeiGZK2EwGp/fB6nokv9U3K/UEZnCNTorF3mlGGhwTuAb9tGK3XI w6ZKNhLxvbQZs5Sy4zycfjUXMISsQvum4p2GJphV3HsaYSi746AtYYFS8DJwU8mr L6iCLW+nzbewt3GIqxzp95x5wNccW1c0csN85zy6HPLa33sUJE3Ay6V9gyFXDztK SzYUf+HKU5E2hVL5os74MhkxoWI/bo8DI/AYBVqFQJtK4ta1gpo+yTN3EBn4JKKb lkYWc+v3qKBiw/DyiAu3Epo5yl8qWZIanBBaKpwQ3UYZmU6UwmWz8nVrK7jTumlI Qsci4LzBilGDzU+LBWgE =RuxD -----END PGP SIGNATURE----- --Sig_/Ho=k.9lf.Wtm=c5XNC3Os0q--