Re: linux-next: manual merge of the arm64 tree with Linus' tree

From	Catalin Marinas <catalin.marinas@arm.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the arm64 tree with Linus' tree
Date	2016-11-22 14:40 +0100
Message-ID	<sGjsJ-7Is-3@gated-at.bofh.it> (permalink)
References	<sG6lP-7M0-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Stephen,

On Tue, Nov 22, 2016 at 10:34:58AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/include/asm/cpufeature.h
> 
> between commit:
> 
>   272d01bd790f ("arm64: Fix circular include of asm/lse.h through linux/jump_label.h")
> 
> from Linus' tree and commits:
> 
>   a4023f682739 ("arm64: Add hypervisor safe helper for checking constant capabilities")
>   82e0191a1aa1 ("arm64: Support systems without FP/ASIMD")
> 
> from the arm64 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The merge resolution and additional patch look fine. Thanks.

-- 
Catalin

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the arm64 tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-22 00:40 +0100
  Re: linux-next: manual merge of the arm64 tree with Linus' tree Catalin Marinas <catalin.marinas@arm.com> - 2016-11-22 14:40 +0100

csiph-web