Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the creds tree got a conflict in mm/migrate.c
> between commit sys_move_pages ("mm: extract do_pages_move() out of
> sys_move_pages()") from Linus' tree and commits
> b76546e8e9ac10969037c4866fcc44716e66eef8 ("CRED: Wrap task credential
> accesses in the core kernel"), 12da5768699059a4fe96080df5fa4e6d0e73a9ba
> ("CRED: Separate task security context from task_struct") and
> e3c5b08cf35d6e1913789255e0755dfb46cc0807 ("CRED: Use RCU to access
> another task's creds and to release a task's own creds") from the creds
> tree.
ACK.
David
--
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
