From: Will Deacon <will.deacon@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Catalin Marinas <Catalin.Marinas@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
"grant.likely@linaro.org" <grant.likely@linaro.org>,
"rjw@rjwysocki.net" <rjw@rjwysocki.net>,
"linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
"hanjun.guo@linaro.org" <hanjun.guo@linaro.org>,
"al.stone@linaro.org" <al.stone@linaro.org>,
"graeme.gregory@linaro.org" <graeme.gregory@linaro.org>,
"msalter@redhat.com" <msalter@redhat.com>
Subject: Re: Request for additional arm64 branch in linux-next
Date: Tue, 28 Apr 2015 17:35:52 +0100 [thread overview]
Message-ID: <20150428163552.GB14963@arm.com> (raw)
In-Reply-To: <20150326111055.273aa644@canb.auug.org.au>
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@arm.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
WARNING: multiple messages have this Message-ID (diff)
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: Request for additional arm64 branch in linux-next
Date: Tue, 28 Apr 2015 17:35:52 +0100 [thread overview]
Message-ID: <20150428163552.GB14963@arm.com> (raw)
In-Reply-To: <20150326111055.273aa644@canb.auug.org.au>
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@arm.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
next prev parent reply other threads:[~2015-04-28 16:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-25 17:20 Request for additional arm64 branch in linux-next Will Deacon
2015-03-25 17:20 ` Will Deacon
2015-03-25 17:42 ` Borislav Petkov
2015-03-25 17:42 ` Borislav Petkov
2015-03-26 0:10 ` Stephen Rothwell
2015-03-26 0:10 ` Stephen Rothwell
2015-03-26 13:49 ` Will Deacon
2015-03-26 13:49 ` Will Deacon
2015-04-28 16:35 ` Will Deacon [this message]
2015-04-28 16:35 ` Will Deacon
2015-04-28 21:25 ` Stephen Rothwell
2015-04-28 21:25 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150428163552.GB14963@arm.com \
--to=will.deacon@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=al.stone@linaro.org \
--cc=graeme.gregory@linaro.org \
--cc=grant.likely@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=msalter@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.