From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123AbdGDBaj (ORCPT ); Mon, 3 Jul 2017 21:30:39 -0400 Received: from ozlabs.org ([103.22.144.67]:54837 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858AbdGDBai (ORCPT ); Mon, 3 Jul 2017 21:30:38 -0400 Date: Tue, 4 Jul 2017 11:30:36 +1000 From: Stephen Rothwell To: Greg KH Cc: Linus Torvalds , Andrew Morton , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] Char/Misc driver patches for 4.13-rc1 Message-ID: <20170704113036.46b6a151@canb.auug.org.au> In-Reply-To: <20170703150030.GA2492@kroah.com> References: <20170703150030.GA2492@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Mon, 3 Jul 2017 17:00:30 +0200 Greg KH 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 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 --- 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