linux-kernel - Re: linux-next: manual merge of the usb-gadget tree with the usb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20130802072303.GC24465@radagast>
Date:	Fri, 2 Aug 2013 10:23:03 +0300
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Felipe Balbi <balbi@...com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Jingoo Han <jg1.han@...sung.com>,
	Greg KH <greg@...ah.com>,
	Tuomas Tynkkynen <ttynkkynen@...dia.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree

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.
> 
> 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

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)