Linus Torvalds
54d46ea993
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal ...
Pull signal handling cleanups from Al Viro:
"sigaltstack infrastructure + conversion for x86, alpha and um,
COMPAT_SYSCALL_DEFINE infrastructure.
Note that there are several conflicts between "unify
SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline;
resolution is trivial - just remove definitions of SS_ONSTACK and
SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and
include/uapi/linux/signal.h contains the unified variant."
Fixed up conflicts as per Al.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
alpha: switch to generic sigaltstack
new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those
generic compat_sys_sigaltstack()
introduce generic sys_sigaltstack(), switch x86 and um to it
new helper: compat_user_stack_pointer()
new helper: restore_altstack()
unify SS_ONSTACK/SS_DISABLE definitions
new helper: current_user_stack_pointer()
missing user_stack_pointer() instances
Bury the conditionals from kernel_thread/kernel_execve series
COMPAT_SYSCALL_DEFINE: infrastructure
2012-12-20 18:05:28 -08:00
USB: move common alchemy USB routines to arch/mips/alchemy/common.c
2012-10-22 11:29:12 -07:00
MIPS: AR7: use part_probe_types to specificy the partition parser to use
2012-12-13 18:15:23 +01:00
USB: EHCI: remove ehci_port_power() routine
2012-10-31 12:48:07 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: BCM63XX: fix nvram checksum calculation
2012-12-12 18:57:49 +01:00
MIPS: Alchemy: Single kernel for DB1200/1300/1550
2012-10-11 11:11:20 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: Kconfig: Rename several firmware related config symbols.
2012-12-13 17:02:14 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-12-20 18:05:28 -08:00
MIPS: JZ4740: Forward declare struct uart_port in header.
2012-10-17 17:00:50 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: Fix crash that occurs when function tracing is enabled
2012-11-23 18:44:38 +01:00
MIPS: Loongson 2: Sort out clock managment.
2012-08-01 18:10:06 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: Fix for warning from FPU emulation code
2012-12-13 18:15:27 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: Malta: Fix interupt number of CBUS UART.
2012-11-13 14:50:15 +01:00
MIPS: Add core files for MIPS SEAD-3 development platform.
2012-09-13 15:43:46 -05:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next
2012-12-13 19:40:13 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
MIPS: PMC-Sierra Yosemite: Remove support.
2012-12-13 18:15:30 +01:00
MIPS: PNX8550: use OHCI platform driver
2012-10-22 11:24:11 -07:00
MIPS: PowerTV: Fix build.
2012-12-13 18:15:28 +01:00
MIPS: RB532: Fix build of prom code.
2012-12-13 18:15:28 +01:00
MIPS: IP22/IP28: Fix build of EISA code.
2012-12-13 18:15:28 +01:00
MIPS: Kconfig: Rename several firmware related config symbols.
2012-12-13 17:02:14 +01:00
MIPS: Kconfig: Rename several firmware related config symbols.
2012-12-13 17:02:14 +01:00
treewide: fix typo of "suport" in various comments and Kconfig
2012-11-19 14:16:09 +01:00
MIPS: wrppmc: Fix build of PCI code.
2012-12-13 18:15:29 +01:00
Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
2012-09-28 16:29:55 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-12-20 18:05:28 -08:00
MIPS: PMC-Sierra Yosemite: Remove support.
2012-12-13 18:15:30 +01:00
54d46ea993