mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: "Mark Brown" <broonie@kernel.org>, "Mickaël Salaün" <mic@digikod.net>
Cc: "Iván Ezequiel Rodriguez" <ivanrwcm25@gmail.com>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the landlock tree with the jc_docs tree
Date: Fri, 02 Oct 2026 23:54:47 -0600	[thread overview]
Message-ID: <87wlrzs508.fsf@trenco.lwn.net> (raw)
In-Reply-To: <asBE2fWPEmruN_dj@sirena.co.uk>

Mark Brown <broonie@kernel.org> 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

      reply	other threads:[~2026-10-03  5:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-02 23:57 Mark Brown
2026-10-03  5:54 ` Jonathan Corbet [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wlrzs508.fsf@trenco.lwn.net \
    --to=corbet@lwn.net \
    --cc=broonie@kernel.org \
    --cc=ivanrwcm25@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mic@digikod.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®