From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>, Guenter Roeck <linux@roeck-us•net>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
SeongJae Park <sj@kernel•org>
Subject: linux-next: manual merge of the jc_docs tree with the hwmon-staging tree
Date: Wed, 1 Feb 2023 09:54:29 +1100 [thread overview]
Message-ID: <20230201095429.3aa29df0@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2023-01-31 22:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230201095429.3aa29df0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=sj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox