Re: some patches for the ptp framework

Richard Cochran
2011-03-10T07:02:23Z

On Fri, Mar 04, 2011 at 07:21:20AM +0100, Richard Cochran wrote:
> On Thu, Mar 03, 2011 at 06:26:11PM +0100, Torben Hohn wrote:
> > Richards Patchset didnt apply to tip:core/timer as is.
> > which branch is it based on ?
>
> I can apply them to
>
> db1c1cce4a653dcbe6949c72ae7b9f42cab1b929
>
> near the head of timers/core in
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
>
> I guess the newer CLOCK_BOOTTIME commits cause a conflict. I will
> rebase once again to fix that.

Torben, I don't understand why you couldn't apply V12 to the
timers/core head. It works fine for me...

Richard

a0e5fef2 ptp: Added a clock driver for the National Semiconductor PHYTER.
a992fe1f ptp: Added a clock driver for the IXP46x.
d57a0b3e ptp: Added a clock that uses the eTSEC found on the MPC85xx.
3f341675 ptp: Added a brand new class driver for ptp clocks.
5cd10e79 hrtimer: Update base[CLOCK_BOOTTIME].offset correctly
7fdd7f89 timers: Export CLOCK_BOOTTIME via the posix timers interface
70a08cca timers: Add CLOCK_BOOTTIME hrtimer base
314ac371 time: Extend get_xtime_and_monotonic_offset() to also return sleep
abb3a4ea time: Introduce get_monotonic_boottime and ktime_get_boottime
e06383db hrtimers: extend hrtimer base code to handle more then 2 clockids
db1c1cce ntp: Remove redundant and incorrect parameter check
22b7fcda mn10300: Switch do_timer() to xtimer_update()
0606f422 posix clocks: Introduce dynamic clocks