From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree Date: Mon, 8 Sep 2014 17:06:59 +1000 Message-ID: <20140908170659.1ec79726@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/8_ECue.VeiFsHT.TH9Ht3ja"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:44765 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbaIHHHH (ORCPT ); Mon, 8 Sep 2014 03:07:07 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Felipe Balbi , Yegor Yefremov Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes --Sig_/8_ECue.VeiFsHT.TH9Ht3ja Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Felipe, Today's linux-next merge of the usb-gadget tree got conflicts in drivers/usb/gadget/Makefile, drivers/usb/gadget/legacy/Makefile and drivers/usb/gadget/function/Makefile between commit 5d19703822da ("usb: gadget: remove $(PWD) in ccflags-y") from Linus' tree and commit fa31409a82ee ("usb: gadget: use $(srctree) instead of $(PWD) for includes") from the usb-gadget tree. I fixed it up (I used the version from the usb-gadget tree) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/8_ECue.VeiFsHT.TH9Ht3ja Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUDVWXAAoJEMDTa8Ir7ZwVhlwP/1ydk5G1YHyOh/Aa1twGYBSE Q6ahr5sdngs1BLiBQZ8vZXOA7E7CsPDfmp6/pAW7FvXCQ6gjBX+5M/zaBFHYc24M TzLlwJO/oHUaVtvSjUlmnMjgCCHu2t7S6BmTjV0X1bCgaeyfkDhPc6+F+bvDOm7n Y62QfsJxKd6dGsnvkWxYuz4hc2b85JjqMaOaFnRS4E+6txoH9ETXs2hlRRRbOifp xUOZswRkKnbCmnGr8FaDPCkNMv6cJcQVGDwUA2u1E91EfM/PCRq6a6OfLpKeGEPW Z9kcUnuE5SUCknWWIiFnX5CeDbRsmJzGypM+ZMncuLSLOZH8siEbq/+a0WrW53Kz sIiCEEfHnX/8Yac7OHgN58s7pcEvyonZYZRR+GLU392I3nL1VPu13Pqh+P/tlDeR HSLXHmfaPHVTekPrRIX6bCVU7jDE3MNv5WMQXCL49Kp7O9tr3hHWf2s4PK2ORvUn Bk5APRwX8Nhh2SNoJBCUD/rlrkT73LPGgbCRFEcyWWwIbSzLFbYu8uxCniGreZJK hQTx8dGks0EdUp/a5+qQ/XL783/doT9L4twqVxlbt6E0P1pKVlDby16ukkkKdGko tnoWaMFIeXyNqBfirvp5fJQH9+TjmAJM/nVqQYG/DsbGKFiqhJ4tGnTJ1LIO71lF 8+NuftWRLyH5FH4p7RnD =agzU -----END PGP SIGNATURE----- --Sig_/8_ECue.VeiFsHT.TH9Ht3ja--