linux-next: manual merge of the limits tree with the tree
in [Kernel]
|
Prev: [patch] media video cx23888 driver: fix possible races using new kfifo_API kfifo_reset()
Next: [PATCH 3/4] Documentation: update ftrace-design.txt
From: Stephen Rothwell on 18 Dec 2009 17:50 Hi Jiri, 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. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ diff --cc fs/exec.c index ac52447,8a160a1..0000000 --- a/fs/exec.c +++ b/fs/exec.c @@@ -1772,11 -1763,6 +1772,11 @@@ void do_coredump(long signr, int exit_c int helper_argc = 0; int dump_count = 0; static atomic_t core_dump_count = ATOMIC_INIT(0); + struct coredump_params cprm = { + .signr = signr, + .regs = regs, - .limit = current->signal->rlim[RLIMIT_CORE].rlim_cur, ++ .limit = rlimit(RLIMIT_CORE), + }; audit_core_dumps(signr);
From: Jiri Slaby on 22 Dec 2009 10:10
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(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |