From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: linux-next: some merging notes Date: Wed, 12 Dec 2012 10:19:19 +1100 Message-ID: <1355267959.19932.40.camel@pasglop> References: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from gate.crashing.org ([63.228.1.57]:44608 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754052Ab2LKXV4 (ORCPT ); Tue, 11 Dec 2012 18:21:56 -0500 In-Reply-To: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Linus , linux-next@vger.kernel.org, LKML , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, David Miller , netdev@vger.kernel.org, Rusty Russell , Greg KH , Steven Rostedt , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Tomi Valkeinen , "N, Mugunthan V" , Nathan Fontenot , Bill Pemberton On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote: > The powerpc tree > (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) > contains a commit that breaks the building of > lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to > linux-next to disable CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT. I will put a fix in before I send the pull request. Cheers, Ben. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1E9AC2C0087 for ; Wed, 12 Dec 2012 10:21:37 +1100 (EST) Message-ID: <1355267959.19932.40.camel@pasglop> Subject: Re: linux-next: some merging notes From: Benjamin Herrenschmidt To: Stephen Rothwell Date: Wed, 12 Dec 2012 10:19:19 +1100 In-Reply-To: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> References: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: "N, Mugunthan V" , Bill Pemberton , Arnd Bergmann , Greg KH , linuxppc-dev@lists.ozlabs.org, Tomi Valkeinen , Rusty Russell , LKML , Steven Rostedt , linux-next@vger.kernel.org, Paul Mackerras , netdev@vger.kernel.org, Olof Johansson , Nathan Fontenot , Linus , David Miller , linux-arm-kernel@lists.infradead.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote: > The powerpc tree > (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) > contains a commit that breaks the building of > lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to > linux-next to disable CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT. I will put a fix in before I send the pull request. Cheers, Ben. From mboxrd@z Thu Jan 1 00:00:00 1970 From: benh@kernel.crashing.org (Benjamin Herrenschmidt) Date: Wed, 12 Dec 2012 10:19:19 +1100 Subject: linux-next: some merging notes In-Reply-To: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> References: <20121212091552.02c72c8926f9f9147b080d68@canb.auug.org.au> Message-ID: <1355267959.19932.40.camel@pasglop> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote: > The powerpc tree > (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) > contains a commit that breaks the building of > lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to > linux-next to disable CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT. I will put a fix in before I send the pull request. Cheers, Ben.