Messages in this thread | | | From | Catalin Marinas <> | Date | Mon, 26 Nov 2012 16:49:57 +0000 | Subject | Re: linux-next: manual merge of the akpm tree with the signal tree |
| |
On 26 November 2012 13:08, Stephen Rothwell <sfr@canb.auug.org.au> 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 tree and commit "compat: generic > compat_sys_sched_rr_get_interval() implementation" from the akpm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks fine to me. Thanks.
-- Catalin
| |