On Mon, Apr 16, 2012 at 03:02:58PM +1000, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got conflicts in kernel/sys.c > and include/linux/prctl.h between commit 259e5e6c75a9 ("Add PR_{GET,SET} > _NO_NEW_PRIVS to prevent execve from granting privs") from the security > tree and patch "c/r: prctl: add ability to get clear_tid_address" from > the akpm tree. > > I fixed them up (see below) and can carry the fix as necessary. Thanks, Stephen. Cyrill -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html