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,
Hector Martin <hector@marcansoft.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org, Andre Heider <a.heider@gmail.com>,
Geoff Levand <geoff@infradead.org>
Subject: Re: linux-next: manual merge of the tty tree with the powerpc tree
Date: Wed, 21 Sep 2011 07:06:23 -0700 [thread overview]
Message-ID: <20110921140623.GA19567@kroah.com> (raw)
In-Reply-To: <20110921150121.9f530384bc0bb6c2268fd9ea@canb.auug.org.au>
On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got conflicts in
> arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between
> commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the
> powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR
> embedded hypervisor byte channel driver") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, that looks fine to me.
greg k-h
WARNING: multiple messages have this Message-ID (diff)
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Geoff Levand <geoff@infradead.org>,
Andre Heider <a.heider@gmail.com>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Hector Martin <hector@marcansoft.com>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the tty tree with the powerpc tree
Date: Wed, 21 Sep 2011 07:06:23 -0700 [thread overview]
Message-ID: <20110921140623.GA19567@kroah.com> (raw)
In-Reply-To: <20110921150121.9f530384bc0bb6c2268fd9ea@canb.auug.org.au>
On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got conflicts in
> arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between
> commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the
> powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR
> embedded hypervisor byte channel driver") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, that looks fine to me.
greg k-h
next prev parent reply other threads:[~2011-09-21 14:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 5:01 linux-next: manual merge of the tty tree with the powerpc tree Stephen Rothwell
2011-09-21 5:01 ` Stephen Rothwell
2011-09-21 5:01 ` Stephen Rothwell
2011-09-21 14:06 ` Greg KH [this message]
2011-09-21 14:06 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
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
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
2011-09-21 4:50 Stephen Rothwell
2011-09-21 4:50 ` Stephen Rothwell
2011-09-21 14:06 ` Greg KH
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=20110921140623.GA19567@kroah.com \
--to=greg@kroah.com \
--cc=a.heider@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=geoff@infradead.org \
--cc=hector@marcansoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.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.