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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 Jun 2019 08:38:19 +1000

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 syscall emulation")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/thread_info.h
index f1d032be628a,c285d1ce7186..000000000000
--- a/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@@ -75,7 -75,8 +75,8 @@@ void arch_release_task_struct(struct ta
   *  TIF_SYSCALL_TRACE	- syscall trace active
   *  TIF_SYSCALL_TRACEPOINT - syscall tracepoint for ftrace
   *  TIF_SYSCALL_AUDIT	- syscall auditing
+  *  TIF_SYSCALL_EMU     - syscall emulation active
 - *  TIF_SECOMP		- syscall secure computing
 + *  TIF_SECCOMP		- syscall secure computing
   *  TIF_SIGPENDING	- signal pending
   *  TIF_NEED_RESCHED	- rescheduling necessary
   *  TIF_NOTIFY_RESUME	- callback before returning to user