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

Stephen Rothwell
2020-10-15T03:21:40Z

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

Hi all,

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

Documentation/x86/index.rst

between commit:

ea4e3bef4c94 ("Documentation/x86: Add documentation for /proc/cpuinfo feature flags")

from Linus' tree and commit:

441848282c59 ("dt: Remove booting-without-of.rst")

from the devicetree 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/x86/index.rst
index 740ee7f87898,1faf44f551bd..000000000000
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@@ -9,7 -9,7 +9,8 @@@ x86-specific Documentatio
:numbered:

boot
+ booting-dt
+ cpuinfo
topology
exception-tables
kernel-stacks