Hi all, On Mon, 3 Jul 2017 17:00:30 +0200 Greg KH <[email protected]> wrote: > > All of these have been in linux-next for a while with the only reported > issue being a merge problem with this tree and the jc-docs tree in the > w1 documentation area. The fix should be obvious for what to do when it > happens, if not, we can send a follow-up patch for it afterward.
I have been using this (after deleting Documentation/DocBook/w1.tmpl): From: Stephen Rothwell <[email protected]> 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 <[email protected]> --- 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
