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

On 26 November 2012 13:08, Stephen Rothwell wrote: > Today's linux-next merge of the akpm tree got a conflict in > arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between > commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic > fork/vfork/clone") from the signal tr

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

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic fork/vfork/clone") from the signal tree and commit "compat: generic compat_sys_sched_

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

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/arm64/kernel/sys_compat.c between commit 0fe8f08036a2 ("arm64: Use generic sys_execve() implementation") from the signal tree and commit "compat: generic compat_sys_sched_rr_get_interval implementation" from the akpm tree.