From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab@s-opensource•com>,
"Andrew F. Davis" <afd@ti•com>
Subject: linux-next: manual merge of the char-misc tree with the jc_docs tree
Date: Wed, 14 Jun 2017 14:04:16 +1000 [thread overview]
Message-ID: <20170614140416.26b97944@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
Documentation/DocBook/w1.tmpl
between commit:
b4c1064a76e7 ("docs-rst: convert w1 book to ReST")
from the jc_docs tree and commit:
f85e8813b2c9 ("DocBook: w1: Update W1 file locations and names in DocBook")
from the char-misc tree.
I fixed it up (I removed the file and added the patch 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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 14 Jun 2017 14:01:14 +1000
Subject: [PATCH] docs-rst: merge fix for "DocBook: w1: Update W1 file
locations and names in DocBook"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
Documentation/driver-api/w1.rst | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Documentation/driver-api/w1.rst b/Documentation/driver-api/w1.rst
index c1da8f0cb476..64826ceba2de 100644
--- a/Documentation/driver-api/w1.rst
+++ b/Documentation/driver-api/w1.rst
@@ -10,12 +10,12 @@ W1 API internal to the kernel
W1 API internal to the kernel
-----------------------------
-drivers/w1/w1.h
-~~~~~~~~~~~~~~~
+include/linux/w1.h
+~~~~~~~~~~~~~~~~~~
-W1 core functions.
+W1 kernel API functions.
-.. kernel-doc:: drivers/w1/w1.h
+.. kernel-doc:: include/linux/w1.h
:internal:
drivers/w1/w1.c
@@ -26,20 +26,20 @@ W1 core functions.
.. kernel-doc:: drivers/w1/w1.c
:internal:
-drivers/w1/w1_family.h
+drivers/w1/w1_family.c
~~~~~~~~~~~~~~~~~~~~~~~
Allows registering device family operations.
-.. kernel-doc:: drivers/w1/w1_family.h
- :internal:
+.. kernel-doc:: drivers/w1/w1_family.c
+ :export:
-drivers/w1/w1_family.c
-~~~~~~~~~~~~~~~~~~~~~~~
+drivers/w1/w1_internal.h
+~~~~~~~~~~~~~~~~~~~~~~~~
-Allows registering device family operations.
+W1 internal initialization for master devices.
-.. kernel-doc:: drivers/w1/w1_family.c
+.. kernel-doc:: drivers/w1/w1_internal.h
:export:
drivers/w1/w1_int.c
--
2.11.0
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-06-14 4:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 4:04 Stephen Rothwell [this message]
2017-06-14 4:33 ` linux-next: manual merge of the char-misc tree with the jc_docs tree Greg KH
2017-07-03 1:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 4:25 Stephen Rothwell
2023-08-22 11:52 ` Greg KH
2017-06-13 6:23 Stephen Rothwell
2017-06-13 7:14 ` Greg KH
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=20170614140416.26b97944@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=afd@ti$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=corbet@lwn$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@s-opensource$(echo .)com \
/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