From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762460Ab3ECBvr (ORCPT ); Thu, 2 May 2013 21:51:47 -0400 Received: from mail-qc0-f182.google.com ([209.85.216.182]:41567 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752643Ab3ECBvq (ORCPT ); Thu, 2 May 2013 21:51:46 -0400 Message-ID: <5183182F.1050408@gmail.com> Date: Thu, 02 May 2013 20:51:43 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130404 Thunderbird/17.0.5 MIME-Version: 1.0 To: Olof Johansson CC: Arnd Bergmann , Nicolas Pitre , "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Stefano Stabellini , Will Deacon , "linux-kernel@vger.kernel.org" , "rob.herring@calxeda.com" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH v10 0/2] (arm-soc for v3.10) arm: introduce psci_smp_ops References: <20130502184801.GF14496@n2100.arm.linux.org.uk> <201305022103.58445.arnd@arndb.de> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/02/2013 03:34 PM, Olof Johansson wrote: > Hi, > > On Thu, May 2, 2013 at 12:03 PM, Arnd Bergmann wrote: >> On Thursday 02 May 2013, Russell King - ARM Linux wrote: >>> The only issue that there is is where we are in the development cycle >>> (almost mid merge window), and I've yet to push anything to Linus thanks >>> to late discovery of various messups in other chunks of code submitted >>> via my tree - I'm starting to drop stuff from my tree in the hope that >>> I'll get back to something that's going to be suitable for mainline. >>> >>> I really don't want to go pulling anything else at the moment in the >>> hope of getting what I currently have out the door. >>> >>> And in any case, we shouldn't be adding any new code to our trees at >>> this point in time. >> >> Agreed. I would have like to see the patches in 3.10, but the timing >> didn't work out. >> >> Stefano, I'm sure we can queue it up early for 3.11 if you send them >> again after the merge window. Sorry you had to go through 10 versions >> and not getting it merged in time in the end. > > Yeah, sorry for being quiet on this; I've seen the patches go by but > also haven't looked closely at them since timing was pointing more > towards 3.11 material. 3.10 is already a very busy release for us on > arm-soc. > > If there's SoC code that needs this as a base, we can do a shared > branch with Russell. That has worked well in the past -- he merges it > but we bring in a copy of the topic in our tree. Yes, there will be. I've got highbank about ready to go. Rob