[lkml]   [2015]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
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 conflicts in:

arch/arm/mach-shmobile/board-marzen-reference.c and

between commit:

3017a8804ada ("ARM: appropriate __init annotation for const data")

from the arm-soc tree and commits:

d2fb6bdaffc7 ("ARM: shmobile: marzen-reference: Remove C board code")
9d35777f2b96 ("ARM: shmobile: marzen: Remove legacy board code")

from the renesas tree.

I fixed it up (I just removed the 2 files) and can carry the fix as
necessary (no action is required).

Stephen Rothwell

 \ /
  Last update: 2015-07-27 02:01    [W:0.025 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site