linux-kernel - 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-next>] [day] [month] [year] [list]

Date: Fri, 5 Jan 2024 13:11:40 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Paul Moore <paul@...l-moore.com>, Jonathan Corbet <corbet@....net>
Cc: 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>, Vegard Nossum <vegard.nossum@...cle.com>
Subject: linux-next: manual merge of the security tree with the jc_docs tree

Hi all,

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
  

Content of type "application/pgp-signature" skipped