linux-kernel - Re: linux-next: manual merge of the usb-gadget tree with the 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20130402084139.GK30286@arwen.pp.htv.fi>
Date:	Tue, 2 Apr 2013 11:41:39 +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>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Greg KH <greg@...ah.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the  tree

Hi,

On Tue, Apr 02, 2013 at 05:11:43PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/chipidea/udc.c between commit adf0f735e61a ("usb: chipidea:
> move debug files creation/removal to the core") from the usb tree and
> commit dc9e2873b740 ("usb: chipidea: let udc-core manage gadget->dev")
> from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

looks alright to me, thank you.

-- 
balbi

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