Request for additional arm64 branch in linux-next

Request for additional arm64 branch in linux-next

[Will Deacon]

Hi Stephen,

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).

I'll let you know when the branch is no longer needed.

Thanks,

Will

--->8

diff --cc arch/arm64/Kconfig
index 4085df18e558,0659db374731..0eae06cdac27
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,7 -1,9 +1,9 @@@
  config ARM64
  	def_bool y
+ 	select ACPI_GENERIC_GSI if ACPI
+ 	select ACPI_REDUCED_HARDWARE_ONLY if ACPI
 -	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +	select ARCH_HAS_ELF_RANDOMIZE
  	select ARCH_HAS_GCOV_PROFILE_ALL
  	select ARCH_HAS_SG_CHAIN
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
diff --cc drivers/xen/Kconfig
index afc39ca5cc4f,a31cd29b68a8..31347cd8c046
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -253,10 -253,8 +253,14 @@@ config XEN_EF
  	def_bool y
  	depends on X86_64 && EFI
  
 +config XEN_AUTO_XLATE
 +	def_bool y
 +	depends on ARM || ARM64 || XEN_PVHVM
 +	help
 +	  Support for auto-translated physmap guests.
 +
+ config XEN_ACPI
+ 	def_bool y
+ 	depends on X86 && ACPI
+ 
  endmenu

Request for additional arm64 branch in linux-next

[Borislav Petkov]

On Wed, Mar 25, 2015 at 05:20:03PM +0000, Will Deacon wrote:
> Hi Stephen,
> 
> We've got a series of patches introducing ACPI support for arm64 that

Oh dear ARM comrades-in-arms, I was hearing rumours and was secretly
hoping that you would stay sane and not do the colossal mistake x86 did.

My condolences.

Perhaps not all is lost after all...

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

Request for additional arm64 branch in linux-next

[Stephen Rothwell]

Hi Will,

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.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150326/9a4a128c/attachment.sig>

Request for additional arm64 branch in linux-next

[Will Deacon]

On Thu, Mar 26, 2015 at 12:10:55AM +0000, Stephen Rothwell wrote:
> 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?

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

Request for additional arm64 branch in linux-next

[Will Deacon]

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

Request for additional arm64 branch in linux-next

[Stephen Rothwell]

Hi Will,

On Tue, 28 Apr 2015 17:35:52 +0100 Will Deacon <will.deacon@arm.com> wrote:
>
> 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 for letting me know.  I have removed it.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150429/33603fcb/attachment.sig>