Messages in this thread | | | Date | Mon, 2 Nov 2015 10:39:13 +0000 | From | Catalin Marinas <> | Subject | Re: 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
| |