Messages in this thread | | | Date | Wed, 14 Jan 2015 07:29:52 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the imx-mxs tree with the arm-soc tree |
| |
Hi Arnd,
On Tue, 13 Jan 2015 14:18:32 +0100 Arnd Bergmann <arnd@arndb.de> wrote: > > There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused > build errors for me. We should soon be able to merge the other branches into > arm-soc to avoid the entire set of merge conflicts, until then please > change your recorded resolution to avoid the build error.
Oops, sorry about that. Fixed.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |