lkml.org 
[lkml]   [2013]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the msm tree with the arm-soc tree
Hi David,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/clock-debug.c between commit ad8c373c9aa3 ("arch: arm:
mach-msm: using strlcpy instead of strncpy") from the arm-soc tree and
commit 8cc7f5338e72 ("ARM: msm: Migrate to common clock framework") from
the msm tree.

The latter removed the file, so I did that, 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: 2013-06-25 10:21    [W:0.029 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site