linux-next: manual merge of the jc_docs tree with the hwmon-staging tree

Posted by Stephen Rothwell 2 years, 7 months ago
Hi all,

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

  Documentation/hwmon/index.rst

between commit:

  62485d4ae451 ("Docs/hwmon/index: Add missing SPDX License Identifier")

from the hwmon-staging tree and commit:

  941c95fdd61f ("Docs/subsystem-apis: Remove '[The ]Linux' prefixes from titles of listed documents")

from the jc_docs 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/hwmon/index.rst
index 96ce91b7d9a8,c2b3c1a822dd..000000000000
--- a/Documentation/hwmon/index.rst
+++ b/Documentation/hwmon/index.rst
@@@ -1,8 -1,6 +1,8 @@@
 +.. SPDX-License-Identifier: GPL-2.0
 +
- =========================
- Linux Hardware Monitoring
- =========================
+ ===================
+ Hardware Monitoring
+ ===================
  
  .. toctree::
     :maxdepth: 1