On 24/09/2014 06:59, Olof Johansson : > On Mon, Sep 15, 2014 at 06:12:43PM +0200, Nicolas Ferre wrote: >> Arnd, Olof, Kevin, >> >> I re-send this pull-request with the work done by Maxime to take Arnd's >> comments into annount: removal of the early_platform devices, and by keeping >> the old mechanism with a function exported by the PIT timer and called by the >> board files. >> >> Here is the old message that I sent you: just as a reference. >> " >> This pull-request is focused on the work that Maxime did for migrating our >> timer (PIT) to the clocksource sub-system. A big cleanup happened which >> allows >> us to be even closer to the point when we have only the bare minimum in our >> formerly crowded mach-at91 directory. >> " >> >> This pull-request goes on top of what is already in your at91/drivers branch. >> >> Thanks, best regards, >> >> The following changes since commit 405a72c5e78b5c560c8b2711d4000fa5eb063e1b: >> >> power: reset: at91-poweroff: fix wakeup status register index (2014-09-01 >> 18:40:44 +0200) >> >> are available in the git repository at: >> >> git://github.com/at91linux/linux-at91.git tags/at91-drivers2 >> >> for you to fetch changes up to b052ff30cd450c91a32e8e928979bca021462996: >> >> ARM: at91: PIT: Move the driver to drivers/clocksource (2014-09-15 >> 17:55:48 +0200) >> >> ---------------------------------------------------------------- >> Second drivers series for AT91/3.18: >> - move of the PIT (basic timer) from mach-at91 to its proper location: >> drivers/clocksource >> - big cleanup of this driver along the way > > Thanks, merged.
Thanks Olof, but there is a merge issue in the merge commit 58c19114886d5352c019979b84f5375970d81f05 (Merge branch 'next/drivers' into for-next). In fact the sama5_dt_timer_init() and ksz9021rn_phy_fixup() functions must be completely removed in this arch/arm/mach-at91/board-dt-sama5.c file. This is causing the errors seen in your and Kevin's buildbots: http://images.armcloud.us/kernel-ci//arm-soc/v3.17-rc4-608-g58bf4da/arm-sama5_defconfig/build.log and http://arm-soc.lixom.net/buildlogs/arm-soc/v3.17-rc4-608-g58bf4da/buildall.arm.sama5_defconfig.log.failed I pushed a branch for conflict resolutions here: git://github.com/at91linux/linux-at91.git at91-3.18-resolved2 https://github.com/at91linux/linux-at91/commits/at91-3.18-resolved2 Bye, -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
