Subject: linux-next: manual merge of the tip tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 13 May 2025 15:48:45 +1000

Hi all,

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

  Documentation/admin-guide/hw-vuln/index.rst

between commit:

  1ac116ce6468 ("Documentation: x86/bugs/its: Add ITS documentation")

from Linus' tree and commit:

  4804f5ad5d63 ("x86/cpu: Add "Old Microcode" docs to hw-vuln toctree")

from the tip 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/admin-guide/hw-vuln/index.rst
index ce296b8430fc,cf1511145927..000000000000
--- a/Documentation/admin-guide/hw-vuln/index.rst
+++ b/Documentation/admin-guide/hw-vuln/index.rst
@@@ -23,4 -23,4 +23,5 @@@ are configurable at compile, boot or ru
     gather_data_sampling
     reg-file-data-sampling
     rsb
 +   indirect-target-selection
+    old_microcode