lkml.org 
[lkml]   [2014]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the renesas tree with the arm-soc tree
Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/boot/dts/r8a7790-lager.dts between commit 637193b2f22c ("Merge
branch 'next/boards' into for-next") from the arm-soc tree and commit
2a3bd7497db1 ("Merge branch 'heads/dt-scif-for-v3.16' into next") from
the renesas tree.

I fixed it up (I used the latter since it kept the trailing semi-colon)
and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-05-22 05:01    [W:0.023 / U:0.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site