linux-kernel - Re: linux-next: manual merge of the limits tree with the 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:	Tue, 22 Dec 2009 16:07:10 +0100
From:	Jiri Slaby <jirislaby@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	Masami Hiramatsu <mhiramat@...hat.com>
Subject: Re: linux-next: manual merge of the limits tree with the  tree

On 12/18/2009 11:46 PM, Stephen Rothwell wrote:
> Today's linux-next merge of the limits tree got a conflict in fs/exec.c
> between commit f6151dfea21496d43dbaba32cfcd9c9f404769bc ("mm: introduce
> coredump parameter structure") from the  tree and commit
> 1157605c47673fc63b052df4688697695a9873d5 ("FS: use helpers for rlimits")
> from the limits tree.
> 
> I fixed it up (see below - thanks Andrew) and can carry the fix for a
> while.

Thanks, I fixed that in my tree and pushed now.

-- 
js
--
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/