Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753582AbbDMIsh (ORCPT ); Mon, 13 Apr 2015 04:48:37 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:37547 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbbDMIse (ORCPT ); Mon, 13 Apr 2015 04:48:34 -0400 Date: Mon, 13 Apr 2015 16:47:37 +0800 From: Wei Yang To: Stephen Rothwell Cc: Wei Yang , Michael Ellerman , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Axtens Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Message-ID: <20150413084737.GA24116@richard> Reply-To: Wei Yang References: <20150413132715.2303253f@canb.auug.org.au> <20150413060913.GA2365@richard> <20150413175531.13d4ceb7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150413175531.13d4ceb7@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041308-0013-0000-0000-000001158E2A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 785 Lines: 34 On Mon, Apr 13, 2015 at 05:55:31PM +1000, Stephen Rothwell wrote: >Hi, > >On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang 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. OK, thanks :-) > >-- >Cheers, >Stephen Rothwell sfr@canb.auug.org.au -- Richard Yang Help you, Help me -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/