linux-next: manual merge of the char-misc tree with the jc_docs tree

linux-next: manual merge of the char-misc tree with the jc_docs tree

[Stephen Rothwell]

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

Re: linux-next: manual merge of the char-misc tree with the jc_docs tree

[Greg KH]

On Wed, Jun 14, 2017 at 02:04:16PM +1000, Stephen Rothwell wrote:
> 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
> 

Looks good to me, thanks!

greg k-h

Re: linux-next: manual merge of the char-misc tree with the jc_docs tree

[Stephen Rothwell]

Hi all,

With the merge window opening, just a reminder that this conflict still
exists.

On Wed, 14 Jun 2017 14:04:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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

Re: linux-next: manual merge of the char-misc tree with the jc_docs tree

[Greg KH]

On Mon, Aug 21, 2023 at 02:25:50PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo
> 
> between commit:
> 
>   ebab9426cd73 ("Documentation/ABI: Fix typos")
> 
> from the jc_docs tree and commit:
> 
>   2cd9ec2a5147 ("docs: ABI: fix spelling/grammar in SBEFIFO timeout interface")
> 
> from the char-misc tree.
> 
> I fixed it up (the latter is a superset of the former) 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.

Thanks for the notice, all looks good.

greg k-h

linux-next: manual merge of the char-misc tree with the jc_docs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo

between commit:

  ebab9426cd73 ("Documentation/ABI: Fix typos")

from the jc_docs tree and commit:

  2cd9ec2a5147 ("docs: ABI: fix spelling/grammar in SBEFIFO timeout interface")

from the char-misc tree.

I fixed it up (the latter is a superset of the former) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the jc_docs tree

[Greg KH]

On Tue, Jun 13, 2017 at 04:23:41PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   Documentation/admin-guide/index.rst
> 
> between commit:
> 
>   504f231cda56 ("doc: ReSTify and split LSM.txt")
> 
> from the jc_docs tree and commit:
> 
>   163f15115203 ("thunderbolt: Add documentation how Thunderbolt bus can be used")
> 
> from the char-misc 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/admin-guide/index.rst
> index e14c374aaf60,6d99a7ce6e21..000000000000
> --- a/Documentation/admin-guide/index.rst
> +++ b/Documentation/admin-guide/index.rst
> @@@ -61,7 -61,7 +61,8 @@@ configure specific aspects of kernel be
>      java
>      ras
>      pm/index
>  +   LSM/index
> +    thunderbolt

Looks good to me, thanks!

greg k-h

linux-next: manual merge of the char-misc tree with the jc_docs tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  Documentation/admin-guide/index.rst

between commit:

  504f231cda56 ("doc: ReSTify and split LSM.txt")

from the jc_docs tree and commit:

  163f15115203 ("thunderbolt: Add documentation how Thunderbolt bus can be used")

from the char-misc 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/admin-guide/index.rst
index e14c374aaf60,6d99a7ce6e21..000000000000
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@@ -61,7 -61,7 +61,8 @@@ configure specific aspects of kernel be
     java
     ras
     pm/index
 +   LSM/index
+    thunderbolt
  
  .. only::  subproject and html