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 941332C0090 for ; Thu, 20 Dec 2012 10:10:21 +1100 (EST) Message-ID: <1355958613.5397.54.camel@pasglop> Subject: Re: [git pull] Please pull powerpc.git next branch From: Benjamin Herrenschmidt To: Linus Torvalds Date: Thu, 20 Dec 2012 10:10:13 +1100 In-Reply-To: References: <1355517897.19932.136.camel@pasglop> <1355787094.5397.30.camel@pasglop> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: linuxppc-dev , Linux Kernel list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, 2012-12-18 at 10:02 -0800, Linus Torvalds wrote: > Anyway, I've pulled it in, but got a conflict on the kernel_thread > cleanups from Al. And since the conflict was in the powerpc assembly > code that I don't really know the details of, I did the > straightforward resolve of it, but I'd like you to check it out. > > (I haven't pushed it out yet, I'm waiting for the allmodconfig to > finish compiling, so if you see this email quickly, but don't see the > powerpc merge yet, just wait a few minutes) Sorry for the delay, I verified that it looked right yesterday but didn't manage to actually test it until today due to a problem with our test farm. It's all good, thanks ! Cheers, Ben.