[U-Boot] [PATCH v5 1/3] dts: Bring in Chrome OS keyboard device tree definition

[Simon Glass]

Hi,

On 5 December 2014 at 09:17, Sjoerd Simons
<sjoerd.simons at collabora.co.uk> wrote:
>
> Hey Simon,
>
> On Thu, 2014-12-04 at 06:36 -0700, Simon Glass wrote:
> > This will be used by nyan-big, but bring it in in a separate patch since it
> > will be common to other boards.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
>
> This will clash with the patch i sent last week to pull (sorry i didn't
> see your v3 for this earlier)  in this dtsi & its documentation & fix
> the existing exynos users/code to correctly use it..
>
> I'm not very familiar with how the u-boot merging process works, so i
> wonder how to best get these patches merged without unnecessary
> conflicts between e.g. the samsung/tegra trees.

It's a race! It will be pretty easy to drop whichever one we need to.
I haven't heard anything on the Tegra side.

Regards,
Simon