public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Eugeniu Rosca <roscaeugeniu@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] doc: Move fastboot protocol doc to android dir
Date: Fri, 19 Jul 2019 11:11:59 +0200	[thread overview]
Message-ID: <20190719091159.GA453@x230> (raw)
In-Reply-To: <20190718235745.GD20116@bill-the-cat>

Hi Sam,

On Thu, Jul 18, 2019 at 07:57:45PM -0400, Tom Rini wrote:
> On Tue, Jul 02, 2019 at 09:14:57PM +0300, Sam Protsenko wrote:
> 
> > Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
> 
> Applied to u-boot/master, thanks!

This recent merge introduced a conflict when applying [1] to master.
Are you aware of any other patches which would conflict with [1]?
If not, I would proceed with sending a v3. TIA.

[1] https://patchwork.ozlabs.org/cover/1131356/ 
   ("[U-Boot,v2,0/5] Fixes and improvements in BCB and Android docs")
-- 
Best Regards,
Eugeniu.

  reply	other threads:[~2019-07-19  9:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-02 18:14 [U-Boot] [PATCH] doc: Move fastboot protocol doc to android dir Sam Protsenko
2019-07-18 23:57 ` Tom Rini
2019-07-19  9:11   ` Eugeniu Rosca [this message]
2019-07-19 14:36     ` Sam Protsenko
2019-07-19 21:45       ` Eugeniu Rosca
2019-07-20 22:36         ` Sam Protsenko

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=20190719091159.GA453@x230 \
    --to=roscaeugeniu@gmail.com \
    --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