linux-next: manual merge of the signal tree with the arm tree

linux-next: manual merge of the signal tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/arm/include/asm/thread_info.h between commit 1f66e06fb641 ("ARM:
7524/1: support syscall tracing") from the arm tree and commit
8ecd548d5fff ("sanitize tsk_is_polling()") from the signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/include/asm/thread_info.h
index f71cdab,b2d6b41..0000000
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@@ -150,8 -148,6 +150,7 @@@ extern int vfp_restore_user_hwstate(str
  #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */
  #define TIF_SYSCALL_TRACE	8
  #define TIF_SYSCALL_AUDIT	9
 +#define TIF_SYSCALL_TRACEPOINT	10
- #define TIF_POLLING_NRFLAG	16
  #define TIF_USING_IWMMXT	17
  #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK	20
@@@ -163,8 -159,6 +162,7 @@@
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
 +#define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
- #define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)
  #define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)
  #define _TIF_SECCOMP		(1 << TIF_SECCOMP)
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]