Re: some patches for the ptp framework

Richard Cochran
2011-03-04T06:21:20Z

On Thu, Mar 03, 2011 at 06:26:11PM +0100, Torben Hohn wrote:
> patches 1 and 3 apply on top of tip:core/timer
>
> patch 2 also requires Richards ptp v12 1/4 for the ptp class.
> modulo a small conflict in drivers/ptp/Makefile and Kconfig.
> because i had added his ixp driver, which the software clock is based on.
>
> 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.

Thanks,
Richard