From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Simon Horman <horms@verge.net.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ulrich Hecht <ulrich.hecht@gmail.com>,
Bastian Hecht <hechtb@gmail.com>,
Paul Mundt <lethal@linux-sh.org>
Subject: linux-next: manual merge of the renesas tree with the sh tree
Date: Mon, 17 Jun 2013 17:13:05 +1000 [thread overview]
Message-ID: <20130617171305.d97598f75a42dfba89b3dbd0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
include/linux/serial_sci.h between commit ada80ee7fa60 ("serial: sh-sci:
Add OF support") from the sh tree and commit 24610a30600b ("serial:
sh-sci: HSCIF support") from the renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/serial_sci.h
index 857eec4,d340497..0000000
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -18,8 -16,7 +18,9 @@@ enum
SCBRR_ALGO_3, /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
SCBRR_ALGO_4, /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
SCBRR_ALGO_5, /* (((clk * 1000 / 32) / bps) - 1) */
+ SCBRR_ALGO_6, /* HSCIF variable sample rate algorithm */
+
+ SCBRR_NR_ALGOS,
};
#define SCSCR_TIE (1 << 7)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2013-06-17 7:13 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=20130617171305.d97598f75a42dfba89b3dbd0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hechtb@gmail.com \
--cc=horms@verge.net.au \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ulrich.hecht@gmail.com \
/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).