linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in fs/splice.c between commit 06ae43f34bcc ("Don't bother with redoing rw_verify_area() from default_file_splice_from()") from Linus' tree and commit 76b021d053ed ("convert vmsplice to COMPAT_SYSCALL_DEFINE") from the signal tree.

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/tile/kernel/compat.c between commit 87c319a2c3c2 ("tile: properly use COMPAT_SYSCALL_DEFINEx") from Linus' tree and commit d5dc77bfeeab ("consolidate compat lookup_dcookie()") from the signal tree. I fixed it up (see below)

Re: linux-next: manual merge of the signal tree with Linus' tree

On 04/03/13 02:03, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the signal tree got a conflict in > include/asm-generic/unistd.h between commit 4dd3c95940b8 > ("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from > Linus' tree and commit 24a2641326f1 ("consolida

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in include/asm-generic/unistd.h between commit 4dd3c95940b8 ("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and SYSCALL_ALIAS declarations") from t

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/tile/Kconfig between commit 887cbce0adea ("arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS") from Linus' tree and commit 15d9a5d9296a ("make HAVE_SYSCALL_WRAPPERS unconditional") from the signal tree. I fixed it up (see

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/h8300/include/asm/signal.h between commit 1ec94e75def5 ("UAPI: (Scripted) Disintegrate arch/h8300/include/asm") from Linus' tree and commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE definitions") from the signal tree. I ju

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/m32r/include/asm/signal.h between commit f7f4dc10e1eb ("UAPI: (Scripted) Disintegrate arch/m32r/include/asm") from Linus' tree and commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE definitions") from the signal tree. I just

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/h8300/include/asm/ptrace.h between commit 1ec94e75def5 ("UAPI: (Scripted) Disintegrate arch/h8300/include/asm") from Linus' tree and commit 1ca97bb541a1 ("new helper: current_user_stack_pointer()") from the signal tree. I f

linux-next: manual merge of the signal tree with Linus' tree and the cris tree

Hi Al, Today's linux-next merge of the signal tree got conflicts in arch/alpha/include/asm/signal.h, arch/x86/include/asm/signal.h and arch/cris/include/asm/signal.h between commits 96433f6ee490 ("UAPI: (Scripted) Disintegrate arch/alpha/include/asm"), af170c5061dd ("UAPI: (Scripted) Disintegrate

linux-next: manual merge of the signal tree with Linus' tree

Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/alpha/kernel/process.c between commit 28d353d9891c ("alpha: take kernel_execve() out of entry.S") from Linus' tree and commit 68f596a7a045 ("alpha: rewrite kernel_execve in C") from the signal tree. These appear to be the s