From: Ralf Baechle <ralf@linux-mips.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>,
John Stultz <john.stultz@linaro.org>
Subject: Re: linux-next: manual merge of the tip tree with the tree
Date: Fri, 13 May 2011 09:03:27 +0100 [thread overview]
Message-ID: <20110513080327.GC12058@linux-mips.org> (raw)
In-Reply-To: <20110513131044.499e82d0.sfr@canb.auug.org.au>
On Fri, May 13, 2011 at 01:10:44PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/i8253.c between commit 2b9b7cd782a5 ("clocksource:
> convert mips to generic i8253 clocksource") from the arm tree and commit
> 75c4fd8c7862 ("mips: convert to clocksource_register_hz/khz") from the
> tip tree.
>
> The former seems to supercede the latter, so I used the former.
That's the right resolution, thanks!
Ralf
next prev parent reply other threads:[~2011-05-13 8:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 3:10 linux-next: manual merge of the tip tree with the tree Stephen Rothwell
2011-05-13 8:03 ` Ralf Baechle [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-11 19:03 Mark Brown
2011-08-18 4:14 Stephen Rothwell
2011-05-31 0:19 Stephen Rothwell
2009-08-17 6:50 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=20110513080327.GC12058@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rmk@arm.linux.org.uk \
--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;
as well as URLs for NNTP newsgroup(s).