From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gYpSp-0005j9-Sl for barebox@lists.infradead.org; Mon, 17 Dec 2018 09:45:29 +0000 Date: Mon, 17 Dec 2018 10:45:15 +0100 From: Sascha Hauer Message-ID: <20181217094515.yc3bs4mu74gnog77@pengutronix.de> References: <20181210155511.1376-1-rhi@pengutronix.de> <20181213065758.i6pujqsmk7ezuw3i@pengutronix.de> <20181214101325.s7skmbskin2qvvfv@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181214101325.s7skmbskin2qvvfv@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/3] Documentation: i.MX: improve wording, add markup and missing articles To: Roland Hieber Cc: Barebox Mailing List 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