]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Oct 2012 01:49:08 +0000 (10:49 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Oct 2012 01:49:08 +0000 (10:49 +0900)
commit8213a2f3eeafdecf06dd718cb4130372263f6067
tree0d02e3201dac64d1429f8552ee1163d4a1ef1646
parent40924754f2cabd5d9af4bcd4dcecc362b5e0baa1
parent12f79be93d94698778ff2b3f921073fc5f6780d6
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/signal

Pull pile 2 of execve and kernel_thread unification work from Al Viro:
 "Stuff in there: kernel_thread/kernel_execve/sys_execve conversions for
  several more architectures plus assorted signal fixes and cleanups.

  There'll be more (in particular, real fixes for the alpha
  do_notify_resume() irq mess)..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (43 commits)
  alpha: don't open-code trace_report_syscall_{enter,exit}
  Uninclude linux/freezer.h
  m32r: trim masks
  avr32: trim masks
  tile: don't bother with SIGTRAP in setup_frame
  microblaze: don't bother with SIGTRAP in setup_rt_frame()
  mn10300: don't bother with SIGTRAP in setup_frame()
  frv: no need to raise SIGTRAP in setup_frame()
  x86: get rid of duplicate code in case of CONFIG_VM86
  unicore32: remove pointless test
  h8300: trim _TIF_WORK_MASK
  parisc: decide whether to go to slow path (tracesys) based on thread flags
  parisc: don't bother looping in do_signal()
  parisc: fix double restarts
  bury the rest of TIF_IRET
  sanitize tsk_is_polling()
  bury _TIF_RESTORE_SIGMASK
  unicore32: unobfuscate _TIF_WORK_MASK
  mips: NOTIFY_RESUME is not needed in TIF masks
  mips: merge the identical "return from syscall" per-ABI code
  ...

Conflicts:
arch/arm/include/asm/thread_info.h
20 files changed:
arch/arm/include/asm/thread_info.h
arch/c6x/include/asm/unistd.h
arch/frv/Kconfig
arch/frv/kernel/process.c
arch/ia64/kernel/signal.c
arch/m68k/Kconfig
arch/m68k/kernel/process.c
arch/microblaze/kernel/signal.c
arch/mn10300/kernel/process.c
arch/powerpc/Kconfig
arch/powerpc/include/asm/processor.h
arch/powerpc/include/asm/thread_info.h
arch/powerpc/include/asm/unistd.h
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/process.c
arch/powerpc/kernel/sys_ppc32.c
arch/tile/kernel/compat_signal.c
arch/x86/kernel/entry_32.S
kernel/sched/core.c