mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: Barebox Mailing List <barebox@lists.infradead.org>
Subject: Re: [PATCH 1/3] Documentation: i.MX: improve wording, add markup and missing articles
Date: Mon, 17 Dec 2018 10:45:15 +0100	[thread overview]
Message-ID: <20181217094515.yc3bs4mu74gnog77@pengutronix.de> (raw)
In-Reply-To: <20181214101325.s7skmbskin2qvvfv@pengutronix.de>

On Fri, Dec 14, 2018 at 11:13:25AM +0100, Roland Hieber wrote:
> Hmm. It still applies here cleanly on next. Do you want it on master
> instead? I don't mind having it in next, and if you applied this series
> on master instead, the conflicts with next will probably be the other
> way around for the next release.

Right, I found the conflicting patch and applied ontop of it.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2018-12-17  9:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-10 15:55 Roland Hieber
2018-12-10 15:55 ` [PATCH 2/3] Documentation: state: fix closing brace without opening brace Roland Hieber
2018-12-10 15:55 ` [PATCH 3/3] Documentation: i.MX: Kindle 4/5: fix sphinx warnings Roland Hieber
2018-12-13  6:57 ` [PATCH 1/3] Documentation: i.MX: improve wording, add markup and missing articles Sascha Hauer
2018-12-14 10:13   ` Roland Hieber
2018-12-17  9:45     ` Sascha Hauer [this message]
2019-01-11 11:35       ` Roland Hieber
2019-01-16 10:15         ` [RESEND] [PATCH 0/2] small doc fixes Roland Hieber
2019-01-16 10:16           ` [RESEND] [PATCH 1/2] Documentation: state: fix closing brace without opening brace Roland Hieber
2019-01-16 10:16           ` [RESEND] [PATCH 2/2] Documentation: i.MX: Kindle 4/5: fix sphinx warnings Roland Hieber
2019-01-17  7:39           ` [RESEND] [PATCH 0/2] small doc fixes Sascha Hauer

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=20181217094515.yc3bs4mu74gnog77@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=rhi@pengutronix.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