From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752066AbaAOK2V (ORCPT ); Wed, 15 Jan 2014 05:28:21 -0500 Received: from gate.crashing.org ([63.228.1.57]:54977 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750920AbaAOK2S (ORCPT ); Wed, 15 Jan 2014 05:28:18 -0500 Message-ID: <1389781680.6933.88.camel@pasglop> Subject: Re: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Linus Torvalds Cc: linuxppc-dev list , Linux Kernel list , Andrew Morton Date: Wed, 15 Jan 2014 21:28:00 +1100 In-Reply-To: References: <1389762075.6933.76.camel@pasglop> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote: > On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt > wrote: > > > > My original intend was to put it in powerpc-next and then shoot it to > > stable, but it got a tad annoying (due to churn it needs to be applied > > at least on rc4 or later while my next is at rc1 and clean that way), so > > I put it in the merge branch. > > Quite frankly, I'll prefer to not merge it now, and then 3.13 will get > it from stable, when it does things like this. > > Partly because it fixes a power-only bug, but potentially changes > non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Right, I wasn't too comfortable either. I'll resend the pull request after the merge window is open. Cheers, Ben. > Linus > -- > 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/