Messages in this thread | | | Date | Wed, 4 Jan 2012 13:18:18 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the s5p tree with the tree |
| |
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in arch/arm/mach-s3c2410/include/mach/system-reset.h between commit 281c8724c10c ("ARM: restart: Temporary #error to persuade platform maintainers to take the restart changes seriously") from the arm tree and commit 11ca5f97077d ("ARM: restart: S3C24XX: use new restart hook") from the s5p tree.
The arm tree patch seems to have had the desired affect so I used the s5p tree version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |