* linux-next: manual merge of the jc_docs tree with the hwmon-staging tree
@ 2023-01-31 22:54 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-01-31 22:54 UTC (permalink / raw)
To: Jonathan Corbet, Guenter Roeck
Cc: Linux Kernel Mailing List, Linux Next Mailing List, SeongJae Park
[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-31 22:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-31 22:54 linux-next: manual merge of the jc_docs tree with the hwmon-staging tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox