From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree Date: Fri, 2 Aug 2013 10:23:03 +0300 Message-ID: <20130802072303.GC24465@radagast> References: <20130802163818.e29c7e6d3472cf161703ae60@canb.auug.org.au> Reply-To: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7gGkHNMELEOhSGF6" Return-path: Received: from arroyo.ext.ti.com ([192.94.94.40]:44967 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755784Ab3HBHX1 (ORCPT ); Fri, 2 Aug 2013 03:23:27 -0400 Content-Disposition: inline In-Reply-To: <20130802163818.e29c7e6d3472cf161703ae60@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Felipe Balbi , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jingoo Han , Greg KH , Tuomas Tynkkynen --7gGkHNMELEOhSGF6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host: > use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb: > tegra: host: Remove references to plat data") from the usb-gadget tree. >=20 > I fixed it up (the latter just removed the code updated by the former, so > I did that) and can carry the fix as necessary (no action is required). Thank you --=20 balbi --7gGkHNMELEOhSGF6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBAgAGBQJR+15XAAoJEIaOsuA1yqREonEQAIBeaXkRe4RddA478XSUUymp 5xQV8MojRTFMmjwDKkAzw7dLmwDJ/T+j8VgiZL7jONlkC7dr48yX7DKEylSPj5r0 JvfYBWINCoyMurH7/8I+BoCytuMB/H/CZlMO2PZvkTwWHYUtf4kDKLkvDADHeAbY i0avslgsHn4MhrMozbVxsSzXoP9M+nevRVkLccjGX47g1xuJ2K60jGqFzRYfjGvk B9Q5QS+2ix/d5Wi1L9bFLhuF0tpDTlKhulNZBoqJJYyb+FDimVsYX0mCISOWUqak LMUTh+xrTtfRulGVv3Fb8HZoeU3ki0CwAyegx1FmP9nDm2amTEc/shw8hIaFxetq IFLUcaG/qT0X2/GPgzzDPuNFvY5MaSiglFSoWqAg4/wUC54Tj8GXOn7RRritbKgh VB4W9WJLCRd0GZLlGc3rCeja5eocoJUTMzEh6UPgIWiVa1+qJf9EXRevXj7qBHxK pF7bHQGGZt6oolloVyxk2fZwin3BELLwqKtbnkj6fa0Xgwbm9eLUUkxcTgXDv1iK rfmzjUvi5SrC3fnkH8mvta7fvLGvuLn4wolu6cYRNa5YrPqahFb2eTCr225LGe/h 9Hiq3ktFm1Or0OS1HJQQ3izqtktys6YvJ2vzhmeLzfQ6XThjMqa0+nBM4gI4icmq dASzERUa7uWpStnGoJzU =Q5PV -----END PGP SIGNATURE----- --7gGkHNMELEOhSGF6--