linux-next: manual merge of the s5p tree with the arm tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a lot of conflicts caused by
duplicates of commits in your tree and Russell's.  It looks like you have
merged a version of Russell's tree and then it has been rebased and added
to.  You need to fix up your tree with respect to Russell's.

This is a summary of the conflicts I get when I merge the s5p tree (after
merging the arm tree):

CONFLICT (modify/delete): arch/arm/plat-samsung/include/plat/system-reset.h deleted in HEAD and modified in s5p/for-next. Version s5p/for-next of arch/arm/plat-samsung/include/plat/system-reset.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/system.h
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/crag6410.h
CONFLICT (content): Merge conflict in arch/arm/mach-s3c2410/include/mach/system.h
CONFLICT (modify/delete): arch/arm/mach-s3c2410/include/mach/system-reset.h deleted in HEAD and modified in s5p/for-next. Version s5p/for-next of arch/arm/mach-s3c2410/include/mach/system-reset.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-rpc/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-realview/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-prima2/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-pnx4008/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-orion5x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ti8168evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-netx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-mv78xx0/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-mmp/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-ks8695/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-kirkwood/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp2000/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop33x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop32x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-iop13xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-h720x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-footbridge/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (add/add): Merge conflict in arch/arm/mach-exynos/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-ebsa110/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-dove/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-cns3xxx/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-clps711x/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/generic.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature