From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: manual merge of the sh tree with Linus' tree
Date: Mon, 8 Aug 2011 16:26:00 +0900 [thread overview]
Message-ID: <20110808072559.GG32513@linux-sh.org> (raw)
In-Reply-To: <20110808123627.2c151560593ead828dd2f001@canb.auug.org.au>
On Mon, Aug 08, 2011 at 12:36:27PM +1000, Stephen Rothwell wrote:
> 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.
I've done the same, should be fixed for tomorrow, thanks.
next prev parent reply other threads:[~2011-08-08 7:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-08 2:36 linux-next: manual merge of the sh tree with Linus' tree Stephen Rothwell
2011-08-08 7:26 ` Paul Mundt [this message]
-- 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=20110808072559.GG32513@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.