public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [GIT] Pull request: u-boot-dfu (24.11.2018)
Date: Mon, 26 Nov 2018 23:18:28 +0100	[thread overview]
Message-ID: <bbe00ac4-e52f-e764-e046-e44435616d12@denx.de> (raw)
In-Reply-To: <20181126231501.60c96ab3@jawa>

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

  reply	other threads:[~2018-11-26 22:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-24 22:11 [U-Boot] [GIT] Pull request: u-boot-dfu (24.11.2018) Lukasz Majewski
2018-11-25 18:04 ` Marek Vasut
2018-11-26 18:45   ` Tom Rini
2018-11-26 20:21     ` Marek Vasut
2018-11-26 20:22       ` Marek Vasut
2018-11-26 22:15         ` Lukasz Majewski
2018-11-26 22:18           ` Marek Vasut [this message]
2018-11-27 17:38             ` Jean-Jacques Hiblot
2018-11-28 12:24               ` Jean-Jacques Hiblot
2018-11-28 12:26                 ` Marek Vasut
2018-11-28 12:28                   ` Jean-Jacques Hiblot
2018-11-30  7:56 ` [U-Boot] [GIT] Pull request: u-boot-dfu (30.11.2018) Lukasz Majewski
2018-11-30 14:43   ` Marek Vasut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bbe00ac4-e52f-e764-e046-e44435616d12@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox