From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>
Cc: Paul Moore <paul@paul-moore•com>,
Casey Schaufler <casey@schaufler-ca•com>,
Kees Cook <keescook@chromium•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Vegard Nossum <vegard.nossum@oracle•com>
Subject: Re: linux-next: manual merge of the security tree with the jc_docs tree
Date: Wed, 10 Jan 2024 11:13:38 +1100 [thread overview]
Message-ID: <20240110111338.67249eec@canb.auug.org.au> (raw)
In-Reply-To: <20240105131140.7afdbbe3@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]
Hi all,
On Fri, 5 Jan 2024 13:11:40 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the security tree got a conflict in:
>
> Documentation/userspace-api/index.rst
>
> between commits:
>
> 77e075579e88 ("Documentation: move driver-api/isapnp to userspace-api/")
> bb67bf1c4a56 ("Documentation: move driver-api/dcdbas to userspace-api/")
>
> from the jc_docs tree and commit:
>
> f3b8788cde61 ("LSM: Identify modules by more than name")
>
> from the security tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/userspace-api/index.rst
> index 74bc0716432e,8be8b1979194..000000000000
> --- a/Documentation/userspace-api/index.rst
> +++ b/Documentation/userspace-api/index.rst
> @@@ -30,9 -33,7 +30,10 @@@ place where this information is gathere
> sysfs-platform_profile
> vduse
> futex2
> + tee
> + isapnp
> + dcdbas
> + lsm
>
> .. only:: subproject and html
>
This is now a conflict between the jc_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-10 0:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 2:11 linux-next: manual merge of the security tree with the jc_docs tree Stephen Rothwell
2024-01-10 0:13 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-11 1:29 Stephen Rothwell
2024-01-10 0:12 ` Stephen Rothwell
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=20240110111338.67249eec@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=casey@schaufler-ca$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul@paul-moore$(echo .)com \
--cc=vegard.nossum@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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