Messages in this thread | | | Date | Tue, 2 Jul 2013 15:45:14 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the renesas tree with the arm tree |
| |
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit fb521a0da155 ("arm: fix up ARM_ARCH_TIMER selects") from the arm tree and commits 462972da5f18 ("ARM: shmobile: Make r8a7790 Arch timer optional") and 39d97587d6cb ("ARM: shmobile: Make r8a73a4 Arch timer optional") from the renesas tree.
I fixed it up (the latter patches removed the "select"s that the former modified) 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] | |