Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the creds tree got a conflict in
> fs/binfmt_elf_fdpic.c between commit
> 5edc2a5123a7c3d9bcb19ffcf3b91e8d6c246092 ("binfmt_elf_fdpic: wire up
> AT_EXECFD, AT_EXECFN, AT_SECURE") from Linus' tree and commit
> 4865969c64ed7e911fae4e6a275e65789806f823 ("CRED: Wrap current->cred and a
> few other accessors") from the creds tree.
ACK.
--
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
