All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wei Yang <weiyang@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, Daniel Axtens <dja@axtens.net>
Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree
Date: Mon, 13 Apr 2015 17:55:31 +1000	[thread overview]
Message-ID: <20150413175531.13d4ceb7@canb.auug.org.au> (raw)
In-Reply-To: <20150413060913.GA2365@richard>

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Hi,

On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>
> Hi, Stephen,
> 
> Thanks for your finding :-) Your fix looks good to me.
> 
> Michael & Ben,
> 
> Do I need to rebase the patch or what should I do?

You should have nothing to do, Michael has fixed it up when he merged
Ben's tree into his.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wei Yang <weiyang@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, Daniel Axtens <dja@axtens.net>
Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree
Date: Mon, 13 Apr 2015 17:55:31 +1000	[thread overview]
Message-ID: <20150413175531.13d4ceb7@canb.auug.org.au> (raw)
In-Reply-To: <20150413060913.GA2365@richard>

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Hi,

On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>
> Hi, Stephen,
> 
> Thanks for your finding :-) Your fix looks good to me.
> 
> Michael & Ben,
> 
> Do I need to rebase the patch or what should I do?

You should have nothing to do, Michael has fixed it up when he merged
Ben's tree into his.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  reply	other threads:[~2015-04-13  7:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13  3:27 linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Stephen Rothwell
2015-04-13  3:27 ` Stephen Rothwell
2015-04-13  3:27 ` Stephen Rothwell
2015-04-13  6:09 ` Wei Yang
2015-04-13  6:09   ` Wei Yang
2015-04-13  7:55   ` Stephen Rothwell [this message]
2015-04-13  7:55     ` Stephen Rothwell
2015-04-13  8:47     ` Wei Yang
2015-04-13  8:47       ` Wei Yang
2015-04-13  3:30 Stephen Rothwell
2015-04-13  3:30 ` Stephen Rothwell
2015-04-13  3:30 ` 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=20150413175531.13d4ceb7@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=benh@kernel.crashing.org \
    --cc=dja@axtens.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=weiyang@linux.vnet.ibm.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 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.