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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit c8506285ded8 ("procfs: Move /proc/pid/fd
[info] handling code to fd.[ch]") from the vfs tree and commit "coredump:
use SUID_DUMPABLE_ENABLED rather than hardcoded 1" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 67925a7..863b8c7 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -103,7 +103,7 @@ static inline int task_dumpable(struct task_struct *task)
        if (mm)
                dumpable = get_dumpable(mm);
        task_unlock(task);
-       if(dumpable == 1)
+       if(dumpable == SUID_DUMPABLE_ENABLED)
                return 1;
        return 0;
 }

pgpVo12XwH6G8.pgp
Description: PGP signature