lkml.org 
[lkml]   [2015]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm64 tree with Linus' tree
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


\
 
 \ /
  Last update: 2015-11-02 12:01    [W:0.035 / U:1.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site