[U-Boot] [PULL] u-boot-usb/master

[Simon Glass]

Hi Tom,

On 15 April 2015 at 12:16, Marek Vasut <marex at denx.de> wrote:
> On Wednesday, April 15, 2015 at 03:43:37 PM, Tom Rini wrote:
>> On Wed, Apr 15, 2015 at 07:29:41AM -0600, Simon Glass wrote:
>> > Hi Tom,
>> >
>> > On 15 April 2015 at 07:08, Tom Rini <trini at konsulko.com> wrote:
>> > > On Tue, Apr 14, 2015 at 05:50:50AM +0200, Marek Vasut wrote:
>> > > > The following changes since commit
> f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35:
>> > > >   Prepare v2015.04 (2015-04-13 10:53:03 -0400)
>> > > >
>> > > > are available in the git repository at:
>> > > >   git://git.denx.de/u-boot-usb.git HEAD
>> > > >
>> > > > for you to fetch changes up to 7704fdbda3afb3d3bb0749378f444c71f92fb9ca:
>> > > >   usb: gadget: thor: Claim EP after allocating it in thor gadget
>> > > >   (2015-04-14
>> > > >
>> > > > 05:48:12 +0200)
>> > >
>> > > So this and the DM pull request conflict pretty badly.  I can fixup
>> > > everything but common/usb_storage.c with a pretty good degree of
>> > > confidence.  But in that case it looks like DM is trying to do
>> > > something similar to what came in also via the USB tree (better /
>> > > wider probing, roughly).  How do you guys want to handle this?
>> > > Thanks!
>> >
>> > If it is mostly this patch:
>> >       usb_storage : scan all interfaces to find a storage device
>> >
>> > then you could drop it and I could tidy it up and resend. But I'm not
>> > sure what the conflicts are. There's a lot of non-USB stuff in the DM
>> > pull request so I'm reluctant to unpick and retest. But we'll have to
>> > do something. Marek what do you think?
>>
>> Dropping that patch makes the rest of the rejects much easier to
>> understand, FWIW.
>
> Feel free to drop it then, but please notify the author to rebase it
> and repost .

Is this looking OK? Do you need me to do anything to get the two pull
requests in?

Regards,
Simon