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

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

Date:   Thu, 15 Oct 2020 14:21:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>
Cc:     Borislav Petkov <bp@...e.de>,
        Kyung Min Park <kyung.min.park@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ricardo Neri <ricardo.neri-calderon@...ux.intel.com>,
        Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the devicetree tree with Linus' tree

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

Content of type "application/pgp-signature" skipped