Hi Andrew,
Today's linux-next merge of the scsi-post-merge tree got a conflict in
include/linux/prctl.h between commit 2d514487faf1 ("security: Yama LSM")
from the security tree and commit "prctl: add PR_{SET,GET}
_CHILD_SUBREAPER to allow simple process supervision" from the akpm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/prctl.h
index 4d0e5bc,b885c85..0000000
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@@ -114,10 -114,7 +114,13 @@@
# define PR_SET_MM_START_BRK 6
# define PR_SET_MM_BRK 7
+ #define PR_SET_CHILD_SUBREAPER 35
+ #define PR_GET_CHILD_SUBREAPER 36
+
+/*
+ * Set specific pid that is allowed to ptrace the current task.
+ * A value of 0 mean "no process".
+ */
+#define PR_SET_PTRACER 0x59616d61
+
#endif /* _LINUX_PRCTL_H */
Attachment:
pgpFG94FLDzmQ.pgp
Description: PGP signature
