linux-kernel - Re: linux-next: manual merge of the security tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Wed, 10 Jan 2024 11:12:50 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>
Cc: Paul Moore <paul@...l-moore.com>, Casey Schaufler
 <casey@...aufler-ca.com>, Kees Cook <keescook@...omium.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Sumit Garg <sumit.garg@...aro.org>
Subject: Re: linux-next: manual merge of the security tree with the jc_docs
 tree

Hi all,

On Mon, 11 Dec 2023 12:29:17 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the security tree got a conflict in:
> 
>   Documentation/userspace-api/index.rst
> 
> between commit:
> 
>   50709576d81b ("Documentation: Destage TEE subsystem documentation")
> 
> 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 93174ffc7350,8be8b1979194..000000000000
> --- a/Documentation/userspace-api/index.rst
> +++ b/Documentation/userspace-api/index.rst
> @@@ -30,7 -33,7 +30,8 @@@ place where this information is gathere
>      sysfs-platform_profile
>      vduse
>      futex2
>  +   tee
> +    lsm
>   
>   .. only::  subproject and html
>   

This is now a conflict between the jc_docs tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped