From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>, Jamie Iles <jamie@jamieiles.com>
Subject: Re: linux-next: manual merge of the tty tree with the powerpc tree
Date: Wed, 21 Sep 2011 07:06:32 -0700 [thread overview]
Message-ID: <20110921140632.GB19567@kroah.com> (raw)
In-Reply-To: <20110921145023.e38d553e218c8b5a2e71e9d8@canb.auug.org.au>
On Wed, Sep 21, 2011 at 02:50:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250.c between commit 7df5659eefad ("serial/8250: Move
> UPIO_TSI to powerpc") from the powerpc tree and commit 4834d0289785
> ("tty: serial8250: remove UPIO_DWAPB{,32}") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks great, thanks.
greg k-h
next prev parent reply other threads:[~2011-09-21 14:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 4:50 linux-next: manual merge of the tty tree with the powerpc tree Stephen Rothwell
2011-09-21 4:50 ` Stephen Rothwell
2011-09-21 14:06 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-21 5:01 Stephen Rothwell
2011-09-21 5:01 ` Stephen Rothwell
2011-09-21 5:01 ` Stephen Rothwell
2011-09-21 14:06 ` Greg KH
2011-09-21 14:06 ` Greg KH
2023-08-18 4:58 Stephen Rothwell
2023-08-18 4:58 ` Stephen Rothwell
2023-08-22 11:51 ` Greg KH
2023-08-22 11:51 ` Greg KH
2023-08-23 6:08 ` Michael Ellerman
2023-08-23 6:08 ` Michael Ellerman
2023-11-27 0:49 Stephen Rothwell
2023-11-27 0:49 ` Stephen Rothwell
2023-11-27 11:00 ` Michael Ellerman
2023-11-27 11:00 ` Michael Ellerman
2023-11-27 11:17 ` Uwe Kleine-König
2023-11-27 11:17 ` Uwe Kleine-König
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=20110921140632.GB19567@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=jamie@jamieiles.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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.