Hi all,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/driver-api/index.rst
between commit:
680e6ffa1510 ("Documentation: add Linux ACPI to Sphinx TOC tree")
from the pm tree and commit:
09e7d4ed8991 ("docs: Add Generic Counter interface documentation")
from the staging 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/driver-api/index.rst
index aa87075c7846,201247b7c1e8..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -56,7 -56,7 +56,8 @@@ available subsections can be seen below
slimbus
soundwire/index
fpga/index
+ acpi/index
+ generic-counter
.. only:: subproject and html
Attachment:
pgpGCnQTlm5zt.pgp
Description: OpenPGP digital signature
