From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Mundt <lethal@linux-sh.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the sh tree with the sh-current tree
Date: Mon, 27 Dec 2010 09:45:46 +1100 [thread overview]
Message-ID: <20101227094546.63f76577.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Paul,
Today's linux-next merge of the sh tree got a conflict in
arch/sh/kernel/cpu/sh2a/clock-sh7201.c between commit
27f1acccd4d310e941d2e879445324595e2fe463 ("sh: Fix up SH7201 clkfwk
build") from the sh-current tree and commit
16b259203c513ed28bd31cc9a981e0d3ad517943 ("sh: migrate SH_CLK_MD to mode
pin API") from the sh tree.
The latter includes the fix from the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
reply other threads:[~2010-12-26 22:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20101227094546.63f76577.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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
all inboxes | Powered by JetHome®