Merge remote-tracking branch 'block/for-next' into master

diff --cc arch/arm/include/asm/thread_info.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
index fee279e28a72e05bdb67ebc4e7a37a3b35ca3824,77d16390a5245cbf88e259d652ff26983be56625..e0d7833a1827ea1d82adf9cfff56d00e91cf8c40
--- 1/arch/arm/kernel/entry-common.S
--- 2/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@ -50,11 -50,10 +50,11 @@@ __ret_fast_syscall
   UNWIND(.cantunwind   )
        disable_irq_notrace                     @ disable interrupts
        ldr     r2, [tsk, #TI_ADDR_LIMIT]
 -      cmp     r2, #TASK_SIZE
 +      ldr     r1, =TASK_SIZE
 +      cmp     r2, r1
        blne    addr_limit_check_failed
        ldr     r1, [tsk, #TI_FLAGS]            @ re-check for syscall tracing
-       tst     r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
+       movs    r1, r1, lsl #16
        bne     fast_work_pending
  
  
@@@ -88,11 -87,10 +88,11 @@@ __ret_fast_syscall
  #endif
        disable_irq_notrace                     @ disable interrupts
        ldr     r2, [tsk, #TI_ADDR_LIMIT]
 -      cmp     r2, #TASK_SIZE
 +      ldr     r1, =TASK_SIZE
 +      cmp     r2, r1
        blne    addr_limit_check_failed
        ldr     r1, [tsk, #TI_FLAGS]            @ re-check for syscall tracing
-       tst     r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
+       movs    r1, r1, lsl #16
        beq     no_work_pending
   UNWIND(.fnend                )
  ENDPROC(ret_fast_syscall)
@@@ -130,11 -128,10 +130,11 @@@ ret_slow_syscall
        disable_irq_notrace                     @ disable interrupts
  ENTRY(ret_to_user_from_irq)
        ldr     r2, [tsk, #TI_ADDR_LIMIT]
 -      cmp     r2, #TASK_SIZE
 +      ldr     r1, =TASK_SIZE
 +      cmp     r2, r1
        blne    addr_limit_check_failed
        ldr     r1, [tsk, #TI_FLAGS]
-       tst     r1, #_TIF_WORK_MASK
+       movs    r1, r1, lsl #16
        bne     slow_work_pending
  no_work_pending:
        asm_trace_hardirqs_on save = 0

diff --cc arch/ia64/kernel/process.c
Simple merge

diff --cc arch/sparc/include/asm/thread_info_64.h
Simple merge