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

2020-12-01 Thread Catalin Marinas
On Tue, Dec 01, 2020 at 10:05:47AM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/include/asm/exception.h > index 0756191f44f6,2a8aa1884d8a.. > --- a/arch/arm64/include/asm/exception.h > +++ b/arch/arm64/include/asm/exception.h > @@@ -31,13 -31,8 +31,13 @@@ static inline u32 disr

linux-next: manual merge of the arm64 tree with the arm64-fixes tree

2020-11-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/include/asm/exception.h between commits: 23529049c684 ("arm64: entry: fix non-NMI user<->kernel transitions") f0cd5ac1e4c5 ("arm64: entry: fix NMI {user, kernel}->kernel transitions") from the arm64-fixes tr

linux-next: manual merge of the arm64 tree with the arm64-fixes tree

2019-06-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/kernel/module.c between commit: 6f496a555d93 ("arm64: kaslr: keep modules inside module region when KASAN is enabled") from the arm64-fixes tree and commit: 7dfac3c5f40e ("arm64: module: create module allo

linux-next: manual merge of the arm64 tree with the arm64-fixes tree

2019-06-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/include/asm/thread_info.h between commit: 2b55d83e9a8c ("ARM64: trivial: s/TIF_SECOMP/TIF_SECCOMP/ comment typo fix") from the arm64-fixes tree and commit: f086f67485c5 ("arm64: ptrace: add support for sysc

linux-next: manual merge of the arm64 tree with the arm64-fixes tree

2018-03-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm64/kernel/cpu_errata.c between commit: e21da1c99200 ("arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery") from the arm64-fixes tree and commit: c0cda3b8ee6b ("arm64: capabilities: Update prototype for enable