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	2015-11-02 11:40 +0100
Message-ID	<qqkGR-4bJ-11@gated-at.bofh.it> (permalink)
References	<qpOdY-QP-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Sun, Nov 01, 2015 at 10:53:27AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/kernel/suspend.c
> 
> between commit:
> 
>   e13d918a19a7 ("arm64: kernel: fix tcr_el1.t0sz restore on systems with extended idmap")
> 
> from Linus' tree and commit:
> 
>   8e63d3887669 ("arm64: flush: use local TLB and I-cache invalidation")
> 
> from the arm64 tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

The fix-up is fine. Thanks.

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

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> - 2015-11-01 01:00 +0100
  Re: linux-next: manual merge of the arm64 tree with Linus' tree Catalin Marinas <catalin.marinas@arm.com> - 2015-11-02 11:40 +0100

csiph-web