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-checkpatch-fixes"
from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 863b8c7..cceaab0 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 == SUID_DUMPABLE_ENABLED)
+ if (dumpable == SUID_DUMPABLE_ENABLED)
return 1;
return 0;
}
Attachment:
pgpxUUhiQM25C.pgp
Description: PGP signature
