From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: linux-next: manual merge of the timers tree
Date: Tue, 21 Oct 2008 14:15:08 +0200 [thread overview]
Message-ID: <20081021121508.GB9672@elte.hu> (raw)
In-Reply-To: <20081021124305.e6cdd2cc.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the timers tree got a conflict in
> kernel/time/tick-sched.c between commit
> c34bec5a44e9486597d78e7a686b2f9088a0564c ("") from Linus' tree and commit
> cc584b213f252bf698849cf4be2377cd3ec7501a ("hrtimer: convert kernel/* to
> the new hrtimer apis") from the timers tree.
>
> The former moved the code that the latter modified. I fixed it up (see
> below).
thanks Stephen!
I have also pushed out a new tip/auto-timers-next tree which is
conflict-free with latest -git. (it is the same)
Ingo
next prev parent reply other threads:[~2008-10-21 12:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 1:43 linux-next: manual merge of the timers tree Stephen Rothwell
2008-10-21 12:15 ` Ingo Molnar [this message]
2008-10-21 12:18 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 2:02 Stephen Rothwell
2008-10-14 6:12 Stephen Rothwell
2008-10-14 6:03 Stephen Rothwell
2008-10-14 5:59 Stephen Rothwell
2008-10-14 5:51 Stephen Rothwell
2008-09-12 7:10 Stephen Rothwell
2008-09-12 6:57 Stephen Rothwell
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=20081021121508.GB9672@elte.hu \
--to=mingo@elte.hu \
--cc=arjan@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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