Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the security-testing tree got a conflict in
> drivers/char/tty_audit.c between commit
> 49518720d67042cf431e7f96aed5b0f5c51a84e3 ("[PATCH] Audit: Log TIOCSTI")
> from the audit-current tree and commit
> 66303bce9b924e35e435d35409d3abc371755767 ("CRED: Wrap task credential
> accesses in the tty driver") from the security-testing tree.
>
> The former moved the code that the latter was modifying. I fixed it up
> (see below) and can carry the fix as necessary.
Your changes look okay.
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
