From: john stultz <johnstul@us.ibm.com>
To: Paul Mackerras <paulus@samba.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Anton Blanchard <anton@samba.org>,
Thomas Gleixner <tglx@linutronix.de>,
linuxppc-dev@ozlabs.org, Ingo Molnar <mingo@elte.hu>
Subject: Re: [PATCH 04/11] powerpc: Simplify update_vsyscall
Date: Tue, 27 Jul 2010 18:33:27 -0700 [thread overview]
Message-ID: <1280280807.1879.118.camel@localhost> (raw)
In-Reply-To: <20100727234152.GC14947@brick.ozlabs.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]
On Wed, 2010-07-28 at 09:41 +1000, Paul Mackerras wrote:
> On Tue, Jul 13, 2010 at 05:56:21PM -0700, John Stultz wrote:
>
> > Currently powerpc's update_vsyscall calls an inline update_gtod.
> > However, both are straightforward, and there are no other users,
> > so this patch merges update_gtod into update_vsyscall.
> >
> > Compiles, but otherwise untested.
>
> This and the following two patches will cause interesting conflicts
> with two commits in Ben Herrenschmidt's powerpc.git next branch,
> specifically 8fd63a9e ("powerpc: Rework VDSO gettimeofday to prevent
> time going backwards") and c1aa687d ("powerpc: Clean up obsolete code
> relating to decrementer and timebase") from me. In fact the first of
> those two commits includes changes equivalent to those in your 5/11
> patch ("powerpc: Cleanup xtime usage"), as far as I can see.
Ahh.. Right.. I guess I should have remembered you were working on those
changes (even though I don't think I saw the final results sent to lkml
or anything).
Sorry about that.
> BTW, BenH's tree is at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
So I've cherry picked the two changes from the ppc tree, applied them
onto linus' git tree and then rebased my changes ontop of them.
The net of the change to the patch set:
Added to the head of the patch queue:
powerpc: Rework VDSO gettimeofday to prevent time going backwards
powerpc: Clean up obsolete code relating to decrementer and timebase
Modified to resolve collision:
powerpc: Simplify update_vsyscall
Dropped (as earlier patches already made equivalent changes):
powerpc: Cleanup xtime usage
The full set is in the attached tarball.
Thomas, would you consider re-adding these? Hopefully that will avoid
any -next collisions.
thanks
-john
[-- Attachment #2: patches.tar.bz2 --]
[-- Type: application/x-bzip-compressed-tar, Size: 21405 bytes --]
next prev parent reply other threads:[~2010-07-28 1:33 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-14 0:56 [PATCH 00/11] -tip Timekeeping changes for 2.6.36 John Stultz
2010-07-14 0:56 ` [PATCH 01/11] x86: Fix vtime/file timestamp inconsistencies John Stultz
2010-07-14 0:56 ` [PATCH 02/11] Implement timespec_add John Stultz
2010-07-14 0:56 ` [PATCH 03/11] time: Kill off CONFIG_GENERIC_TIME John Stultz
2010-07-14 0:56 ` [PATCH 04/11] powerpc: Simplify update_vsyscall John Stultz
2010-07-14 0:56 ` [PATCH 05/11] powerpc: Cleanup xtime usage John Stultz
2010-07-14 0:56 ` [PATCH 06/11] Fix update_vsyscall to provide wall_to_monotonic offset John Stultz
2010-07-14 0:56 ` [PATCH 07/11] Convert um to use read_persistent_clock John Stultz
2010-07-14 0:56 ` [PATCH 08/11] Cleanup hrtimer.c's direct access to wall_to_monotonic John Stultz
2010-07-14 0:56 ` [PATCH 09/11] Make xtime and wall_to_monotonic static John Stultz
2010-07-14 0:56 ` [PATCH 10/11] Convert common x86 clocksources to use clocksource_register_hz/khz John Stultz
2010-07-14 0:56 ` [PATCH 11/11] Add __clocksource_updatefreq_hz/khz methods John Stultz
2010-07-27 10:49 ` [tip:timers/clocksource] clocksource: " tip-bot for John Stultz
2010-07-27 10:48 ` [tip:timers/clocksource] x86: Convert common clocksources to use clocksource_register_hz/khz tip-bot for John Stultz
2010-07-27 10:48 ` [tip:timers/clocksource] timekeeping: Make xtime and wall_to_monotonic static tip-bot for John Stultz
2010-07-27 10:48 ` [tip:timers/clocksource] hrtimer: Cleanup direct access to wall_to_monotonic tip-bot for John Stultz
2010-07-27 10:47 ` [tip:timers/clocksource] um: Convert to use read_persistent_clock tip-bot for John Stultz
2010-07-27 10:47 ` [tip:timers/clocksource] timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset tip-bot for John Stultz
2010-07-27 10:47 ` [tip:timers/clocksource] powerpc: Cleanup xtime usage tip-bot for John Stultz
2010-07-27 10:46 ` [tip:timers/clocksource] powerpc: Simplify update_vsyscall tip-bot for John Stultz
2010-07-27 23:41 ` [PATCH 04/11] " Paul Mackerras
2010-07-28 1:33 ` john stultz [this message]
2010-07-27 10:46 ` [tip:timers/clocksource] time: Kill off CONFIG_GENERIC_TIME tip-bot for John Stultz
2010-07-27 10:46 ` [tip:timers/clocksource] time: Implement timespec_add tip-bot for John Stultz
2010-07-14 2:40 ` [PATCH 01/11] x86: Fix vtime/file timestamp inconsistencies KOSAKI Motohiro
2010-07-14 16:19 ` john stultz
2010-07-15 1:51 ` KOSAKI Motohiro
2010-07-15 2:46 ` john stultz
2010-07-15 4:41 ` KOSAKI Motohiro
2010-07-15 19:30 ` john stultz
2010-07-15 2:51 ` john stultz
2010-07-15 4:41 ` KOSAKI Motohiro
2010-07-27 10:45 ` [tip:timers/clocksource] " tip-bot for John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280280807.1879.118.camel@localhost \
--to=johnstul@us.ibm.com \
--cc=anton@samba.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox