[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110304062120.GB3824@riccoc20.at.omicron.at>
Date: Fri, 4 Mar 2011 07:21:20 +0100
From: Richard Cochran <richardcochran@...il.com>
To: Torben Hohn <torbenh@....de>
Cc: linux-kernel@...r.kernel.org, richard.cochran@...cron.at,
johnstul@...ibm.com, tglx@...utronix.de
Subject: Re: some patches for the ptp framework
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists