Messages in this thread | | | Date | Tue, 25 Jun 2013 17:41:52 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |