Re: linux-next: manual merge of the landlock tree with the jc_docs tree

[Jonathan Corbet]

Mark Brown <broonie@xxxxxxxxxx> writes:

> Hi all,
>
> Today's linux-next merge of the landlock tree got a conflict in:
>
>   security/landlock/syscalls.c
>
> between commit:
>
>   2ef355c4e6864 ("docs: landlock: fix ENOMSG condition in create_ruleset kernel-doc")
>
> from the jc_docs tree and commit:
>
>   dfec62ac8b246 ("landlock: Enforce namespace use restrictions")
>
> from the landlock tree.

Hmm...I'm actually not sure why I took that one, to tell the truth;
probably the best outcome is that I just drop it?

Thanks,

jon