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 25175B7C67 for ; Thu, 18 Feb 2010 14:31:31 +1100 (EST) Subject: Re: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Kumar Gala In-Reply-To: <3033DBDF-FFD6-4AA5-ADDF-71FE7E0E04E7@kernel.crashing.org> References: <1266463484.16346.382.camel@pasglop> <3033DBDF-FFD6-4AA5-ADDF-71FE7E0E04E7@kernel.crashing.org> Content-Type: text/plain; charset="UTF-8" Date: Thu, 18 Feb 2010 14:30:53 +1100 Message-ID: <1266463853.16346.384.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org, Linus Torvalds List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2010-02-17 at 21:26 -0600, Kumar Gala wrote: > On Feb 17, 2010, at 9:24 PM, Benjamin Herrenschmidt wrote: > > > On Wed, 2010-02-17 at 21:21 -0600, Kumar Gala wrote: > >> Ben, > >> > >> These are two minor fixes that should go into 2.6.33. > > > > It's a bit late for such fixes, but it's your platforms and your call > > here so I'll pull and push out to Linus. > > > > Cheers, > > Ben. > > Yeah, I've been swamped with other stuff and haven't found time to push them out. > Was also hoping to find another oops that was reported but I cant reproduce it. Ok, done. Linus, feel free to pull from either Kumar's tree or mine: The following changes since commit b0483e78e5c4c9871fc5541875b3bc006846d46b: Linus Torvalds (1): Merge git://git.kernel.org/.../gregkh/tty-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Anton Vorontsov (1): powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards Peter Tyser (1): powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem arch/powerpc/platforms/85xx/mpc85xx_mds.c | 3 ++- arch/powerpc/platforms/85xx/smp.c | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-)