linux-next: manual merge of the usb tree with the jc_docs tree

linux-next: manual merge of the usb tree with the jc_docs tree

[Stephen Rothwell]

Hi all,

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

  Documentation/media/v4l-drivers/philips.rst

between commit:

  9b06f754133c ("convert philips.txt to ReST and add to media docs")

from the jc_docs tree and commit:

  21470e32ca7f ("usb: fix some references for /proc/bus/usb")

from the usb 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/media/v4l-drivers/philips.rst
index 620bcfea7af0,be8c80eff374..000000000000
--- a/Documentation/media/v4l-drivers/philips.rst
+++ b/Documentation/media/v4l-drivers/philips.rst
@@@ -145,8 -140,8 +145,8 @@@ dev_hin
  
     A camera is specified by its type (the number from the camera model,
     like PCA645, PCVC750VC, etc) and optionally the serial number (visible
-    in /proc/bus/usb/devices). A hint consists of a string with the following
+    in /sys/kernel/debug/usb/devices). A hint consists of a string with the following
 -   format:
 +   format::
  
        [type[.serialnumber]:]node
  

linux-next: manual merge of the usb tree with the jc_docs tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/ABI/testing/sysfs-bus-umc
  Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

between commit:

  ebab9426cd73 ("Documentation/ABI: Fix typos")

from the jc_docs tree and commit:

  f176638af476 ("USB: Remove Wireless USB and UWB documentation")

from the usb tree.

I fixed it up (I rmeoved the files) 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 usb tree with the jc_docs tree

[Greg KH]

On Mon, Aug 21, 2023 at 02:21:48PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   Documentation/ABI/testing/sysfs-bus-umc
>   Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
> 
> between commit:
> 
>   ebab9426cd73 ("Documentation/ABI: Fix typos")
> 
> from the jc_docs tree and commit:
> 
>   f176638af476 ("USB: Remove Wireless USB and UWB documentation")
> 
> from the usb tree.
> 
> I fixed it up (I rmeoved the files) 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.

Removal is fine, thanks!

greg k-h