On 07/23, Olof Johansson wrote: > On Tue, Jun 25, 2013 at 1:02 PM, Stephen Boyd <sb...@codeaurora.org> wrote: > > Olof/Arnd, > > > > These patches remove the ARM local timer API. The ARM architected > > timers have already moved away from this API so this series > > migrates the rest of the users allowing us to remove the API > > entirely. Thomas has been kind enough to take the first two > > patches into timers/core in the tip tree (thanks Thomas!) so I've > > merged that into v3.10-rc1 and then applied the rest of the > > patches on top. Let me know if this is acceptable. > > > > These patches have been through multiple rounds and tested by > > multiple people since before the 3.10 merge window closed. Only > > Barry's ack is missing (Cced). > > > > Since I don't have a tree on kernel.org, David Brown has been > > kind enough to push my tag out to his repo. Please pull. > > > > The following changes since commit 42cba6e27c4cddc4df701c597dbfa666e1c013c8: > > > > Merge branch 'timers/core' of > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into > > remove-local-timers (2013-06-24 17:45:02 -0700) > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git > > tags/remove-local-timers > > > > for you to fetch changes up to 060fd3043e5e3488504b9e70182e188dd9113aea: > > > > ARM: smp: Remove local timer API (2013-06-24 17:47:34 -0700) > > > > ---------------------------------------------------------------- > > Now that we have a generic arch hook for broadcast we can remove the local > > timer API entirely. Doing so will reduce code in ARM core, reduce the > > architecture dependencies of our timer drivers, and simplify the code > > because > > we no longer go through an architecture layer that is essentially a hotplug > > notifier. > > Hi, > > Merged in as localtimer/removal into next/cleanup. > > I had quite a few merge conflicts due to the __cpuinit removal, so > please double-check my resolutions. >
A __cpuinit is leftover in smp_twd.c. Hopefully you can just redo the merge? -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
