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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 26 Nov 2012 16:49:57 +0000
From:	Catalin Marinas <catalin.marinas@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: Re: linux-next: manual merge of the akpm tree with the signal tree

On 26 November 2012 13:08, Stephen Rothwell <sfr@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/