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,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: linux-next: manual merge of the sh tree with Linus' tree
Date: Mon, 8 Aug 2011 12:36:27 +1000 [thread overview]
Message-ID: <20110808123627.2c151560593ead828dd2f001@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Paul,
Today's linux-next merge of the sh tree got a conflict in
drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
sh-sci: Fix up default regtype probing") from the sh tree.
These do the same thing slightly differently ("ret" v. "ret != 0"). I
used the version from Linus' tree.
--
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-08-08 2:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 2:36 Stephen Rothwell [this message]
2011-08-08 7:26 ` linux-next: manual merge of the sh tree with Linus' tree Paul Mundt
-- strict thread matches above, loose matches on Subject: below --
2019-07-28 23:25 Stephen Rothwell
2019-12-04 4:55 ` Stephen Rothwell
2010-08-19 1:00 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=20110808123627.2c151560593ead828dd2f001@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 \
--cc=rjw@sisk.pl \
/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).