From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
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,
Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: linux-next: manual merge of the clockevents tree with the tip tree
Date: Mon, 21 Dec 2015 14:08:24 +1100 [thread overview]
Message-ID: <20151221140824.1309a841@canb.auug.org.au> (raw)
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/h8300_timer16.c
between commit:
d33f250af4e6 ("clocksource/drivers/h8300: Use ioread / iowrite")
from the tip tree and commit:
1ddca16cc5b3 ("clocksource/drivers/h8300: Use ioread / iowrite")
from the clockevents tree.
The former is just a fixed version of the latter, so I used that.
It looks like the clockevents tree needs to be cleaned up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2015-12-21 3:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-21 3:08 Stephen Rothwell [this message]
2019-08-26 5:08 linux-next: manual merge of the clockevents tree with the tip tree Stephen Rothwell
2023-06-23 1:56 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=20151221140824.1309a841@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=ysato@users.sourceforge.jp \
/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).