From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbbCZNtj (ORCPT ); Thu, 26 Mar 2015 09:49:39 -0400 Received: from foss.arm.com ([217.140.101.70]:53476 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752411AbbCZNtg (ORCPT ); Thu, 26 Mar 2015 09:49:36 -0400 Date: Thu, 26 Mar 2015 13:49:33 +0000 From: Will Deacon To: Stephen Rothwell Cc: Catalin Marinas , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Lorenzo Pieralisi , "grant.likely@linaro.org" , "rjw@rjwysocki.net" , "linux-acpi@vger.kernel.org" , "hanjun.guo@linaro.org" , "al.stone@linaro.org" , "graeme.gregory@linaro.org" , "msalter@redhat.com" Subject: Re: Request for additional arm64 branch in linux-next Message-ID: <20150326134932.GD2805@arm.com> References: <20150325172002.GN24636@arm.com> <20150326111055.273aa644@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150326111055.273aa644@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 26, 2015 at 12:10:55AM +0000, Stephen Rothwell wrote: > On Wed, 25 Mar 2015 17:20:03 +0000 Will Deacon wrote: > > We've got a series of patches introducing ACPI support for arm64 that > > are tentatively targetting the 4.1 merge window. Whilst there are > > face-to-face discussions set to happen in the next day or so around this > > topic, could you please pull this into linux-next under the assumption > > that we decide to go ahead for mainline inclusion? > > > > git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/acpi > > > > I've kept the series separate from the usual arm64 branch (for-next/core) > > but they merge without conflicts. Merging with today's next, I see two > > trivial Kconfig conflicts (resolution below). > > Added from today (and thanks for the hints). Will this be merged via > another tree, or go directly to Linus? Thank, Stephen. Yes, we've been collecting Acks for a while now, so the plan is to send this to Linus as an extra arm64 pull request. Will