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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/usb/gadget-testing.rst

between commit:

  20d03ae36ec0 ("usb: gadget: ncm: Fix indentations in documentation of NCM section")

from the usb.current tree and commit:

  e49bf650ab5b ("usb: gadget: fix max_segment_size malformed table")

from the jc_docs tree.

I fixed it up (these commits fix the same problem, I used 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 jc_docs tree with the usb.current tree

[Greg Kroah-Hartman]

On Wed, Jan 31, 2024 at 09:52:31AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/usb/gadget-testing.rst
> 
> between commit:
> 
>   20d03ae36ec0 ("usb: gadget: ncm: Fix indentations in documentation of NCM section")
> 
> from the usb.current tree and commit:
> 
>   e49bf650ab5b ("usb: gadget: fix max_segment_size malformed table")
> 
> from the jc_docs tree.
> 
> I fixed it up (these commits fix the same problem, I used 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.

Fixup sounds good, thanks!

gre gk-h

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

[Jonathan Corbet]

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:

> On Wed, Jan 31, 2024 at 09:52:31AM +1100, Stephen Rothwell wrote:
>> Hi all,
>> 
>> Today's linux-next merge of the jc_docs tree got a conflict in:
>> 
>>   Documentation/usb/gadget-testing.rst
>> 
>> between commit:
>> 
>>   20d03ae36ec0 ("usb: gadget: ncm: Fix indentations in documentation of NCM section")
>> 
>> from the usb.current tree and commit:
>> 
>>   e49bf650ab5b ("usb: gadget: fix max_segment_size malformed table")
>> 
>> from the jc_docs tree.
>> 
>> I fixed it up (these commits fix the same problem, I used 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.
>
> Fixup sounds good, thanks!

OK, fine, I'll drop the patch out of docs-next.

Thanks,

jon