[U-Boot] [GIT] Pull request: u-boot-dfu (24.11.2018)

Marek Vasut marex at denx.de
Mon Nov 26 22:18:28 UTC 2018


On 11/26/2018 11:15 PM, Lukasz Majewski wrote:
> Hi Jean-Jacques ,
> 
>> On 11/26/2018 09:21 PM, Marek Vasut wrote:
>>> On 11/26/2018 07:45 PM, Tom Rini wrote:  
>>>> On Sun, Nov 25, 2018 at 07:04:49PM +0100, Marek Vasut wrote:  
>>>>> On 11/24/2018 11:11 PM, Lukasz Majewski wrote:  
>>>>>> Dear Marek,
>>>>>>
>>>>>> The following changes since commit
>>>>>> 5830791d91d1200854ef78fcb32f808c8080f0f0:
>>>>>>
>>>>>>   Merge tag 'pull-tg18' of git://git.denx.de/u-boot-dm
>>>>>> (2018-11-23 17:25:27 -0500)
>>>>>>
>>>>>> are available in the git repository at:
>>>>>>
>>>>>>   git://git.denx.de/u-boot-dfu.git 
>>>>>>
>>>>>> for you to fetch changes up to
>>>>>> 0edf2bd52772d8202469b77ba63a6cd9867d1053:
>>>>>>
>>>>>>   board: ti: am57xx: remove USB platform code (2018-11-24
>>>>>> 22:59:55 +0100)
>>>>>>
>>>>>>
>>>>>> NOTE:
>>>>>> -----
>>>>>>
>>>>>> This series has a dependency on following patch:
>>>>>> "spl: Add support for logging in SPL and TPL" by Simon Glass
>>>>>> http://patchwork.ozlabs.org/patch/998686/  
>>>>>
>>>>> Let me know when this is upstream .  
>>>>
>>>> This series is now in master, thanks.  
>>>
>>> I presume you want me to pull u-boot-dfu / master branch ? It's not
>>> mentioned in the PR :-(  
>>
>> Please rebase on u-boot-usb/master , it doesn't apply .
>>
> 
> Jean-Jacques, could you check why those two series don't apply anymore
> to u-boot-usb/master (or -master) ?

Because they collide with the SPL USB DM patchset.

-- 
Best regards,
Marek Vasut


More information about the U-Boot mailing list