Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753447AbbDMHzm (ORCPT ); Mon, 13 Apr 2015 03:55:42 -0400 Received: from ozlabs.org ([103.22.144.67]:37578 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753325AbbDMHzi (ORCPT ); Mon, 13 Apr 2015 03:55:38 -0400 Date: Mon, 13 Apr 2015 17:55:31 +1000 From: Stephen Rothwell To: Wei Yang Cc: 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: <20150413175531.13d4ceb7@canb.auug.org.au> In-Reply-To: <20150413060913.GA2365@richard> References: <20150413132715.2303253f@canb.auug.org.au> <20150413060913.GA2365@richard> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/Bpm20_GRTbH22/ObcniWoux"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1747 Lines: 52 --Sig_/Bpm20_GRTbH22/ObcniWoux Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang wr= ote: > > Hi, Stephen, >=20 > Thanks for your finding :-) Your fix looks good to me. >=20 > Michael & Ben, >=20 > 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/Bpm20_GRTbH22/ObcniWoux Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVK3Z4AAoJEMDTa8Ir7ZwVytAP/jclrvEp0a8+4y7X51ex0SmS yF1N5jDQQcLv5jEdeZOQZrsuzv6MPoTl9DlAFScb0Q0UZs4jn7CsIyqmjT64VvsD 8Ahr1v7gXVFjNrYH53UQ0A+0RAybiDlh7I+NK1hnb03lnRtBq2KWzZR2h+//rjQy 8mcZ875kH9YoEso5h8I2sgyIMHIYncn7jKEMG4syD4uLtV3xrNVy+Kl47vNmzqjT AiXWvPQrOo6kXjy8kP7fitzBDOY6NeDQlVb+fOZ8ktRTjPg66KEkjunrNmjuUYWW tj633BMdczlgVVLPP4o2SJL197WmCbPN7XTWqiuaoQjPhd0ddxnDzYTGbhsv/mVi HeshPp0+41KFCZqUPvpqdB6d60gcfpY9rbXb/x354O9/uoQ5W9maV2UJR03WaVeN p4xAIrXalzPTS/tDtvnLdwEA/LYenBQyJPoUCWKsY/zRvAud4pQ0/tYiffemovHU VAfwJZYwMDR88JRM4UFPbh1q0NX5S3iqYFCteC3ry5Cy1IJIznsmam/SHQMtaWJH fWu4n0sJdX06mVcPr0+ra+gotmaDwccoh0NMe+CrvPAEu0hmcr9DVFkJV1eBzzpW s6S08i7CGHTl+YnWu/kQIZjLn403GNSu4rZrG5GP+D3gYDPNOcLDoXSOhoDApY+u t9wowbztZMSPb8mO5wpC =pUej -----END PGP SIGNATURE----- --Sig_/Bpm20_GRTbH22/ObcniWoux-- -- 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/