linux-kernel - Re: Request for additional arm64 branch in linux-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150428163552.GB14963@arm.com>
Date:	Tue, 28 Apr 2015 17:35:52 +0100
From:	Will Deacon <will.deacon@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Catalin Marinas <Catalin.Marinas@....com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Lorenzo Pieralisi <Lorenzo.Pieralisi@....com>,
	"grant.likely@...aro.org" <grant.likely@...aro.org>,
	"rjw@...ysocki.net" <rjw@...ysocki.net>,
	"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
	"hanjun.guo@...aro.org" <hanjun.guo@...aro.org>,
	"al.stone@...aro.org" <al.stone@...aro.org>,
	"graeme.gregory@...aro.org" <graeme.gregory@...aro.org>,
	"msalter@...hat.com" <msalter@...hat.com>
Subject: Re: Request for additional arm64 branch in linux-next

On Thu, Mar 26, 2015 at 12:10:55AM +0000, Stephen Rothwell wrote:
> Hi Will,

Hi again Stephen,

> On Wed, 25 Mar 2015 17:20:03 +0000 Will Deacon <will.deacon@....com> 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?
> 
> > I'll let you know when the branch is no longer needed.
> 
> Excellent.

Just to say that, since the ACPI support code for arm64 was merged in the
recent merge window, this branch is no longer required and can be dropped
from linux-next.

Thanks,

Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/