From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eugeniu Rosca Date: Fri, 19 Jul 2019 11:11:59 +0200 Subject: [U-Boot] [PATCH] doc: Move fastboot protocol doc to android dir In-Reply-To: <20190718235745.GD20116@bill-the-cat> References: <20190702181457.28235-1-semen.protsenko@linaro.org> <20190718235745.GD20116@bill-the-cat> Message-ID: <20190719091159.GA453@x230> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > > 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.