From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Russell King <rmk@arm•linux.org.uk>,
John Stultz <john.stultz@linaro•org>,
Ralf Baechle <ralf@linux-mips•org>
Subject: linux-next: manual merge of the tip tree with the tree
Date: Fri, 13 May 2011 13:10:44 +1000 [thread overview]
Message-ID: <20110513131044.499e82d0.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-13 3:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 3:10 Stephen Rothwell [this message]
2011-05-13 8:03 ` linux-next: manual merge of the tip tree with the tree Ralf Baechle
-- 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=20110513131044.499e82d0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=ralf@linux-mips$(echo .)org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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