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

On Wed, 25 Mar 2015 17:20:03 +0000 Will Deacon [off-list ref] wrote:

quoted

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