linux-kernel - linux-next: manual merge of the amdgpu 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20231212104657.524d359e@canb.auug.org.au>
Date:   Tue, 12 Dec 2023 10:46:57 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>,
        Jonathan Corbet <corbet@....net>
Cc:     Hans de Goede <hdegoede@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ma Jun <Jun.Ma2@....com>, Sumit Garg <sumit.garg@...aro.org>
Subject: linux-next: manual merge of the amdgpu tree with the jc_docs tree

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  Documentation/driver-api/index.rst

between commit:

  50709576d81b ("Documentation: Destage TEE subsystem documentation")

from the jc_docs tree and commit:

  2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism")

from the amdgpu 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/driver-api/index.rst
index 9511db303446,8bc4ebe7a36f..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -112,7 -115,7 +112,8 @@@ available subsections can be seen below
     hte/index
     wmi
     dpll
 +   tee
+    wbrf
  
  .. only::  subproject and html
  

Content of type "application/pgp-signature" skipped