[lkml]   [2014]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the samsung tree with the arm tree
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5pv210/include/mach/memory.h between commit 3ae4e9812941
("ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from
<mach/memory.h>") from the arm tree and commit d78c16ccde96 ("ARM:
SAMSUNG: Remove remaining legacy code") from the samsung tree.

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

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-07-25 03:01    [W:0.035 / U:2.404 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site