* linux-next: manual merge of the jc_docs tree with the usb.current tree
@ 2024-01-30 22:52 Stephen Rothwell
2024-01-30 23:25 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2024-01-30 22:52 UTC (permalink / raw)
To: Jonathan Corbet, Greg Kroah-Hartman
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Randy Dunlap,
Udipto Goswami
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the jc_docs tree with the usb.current tree
2024-01-30 22:52 linux-next: manual merge of the jc_docs tree with the usb.current tree Stephen Rothwell
@ 2024-01-30 23:25 ` Greg Kroah-Hartman
2024-01-30 23:47 ` Jonathan Corbet
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2024-01-30 23:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, Linux Kernel Mailing List,
Linux Next Mailing List, Randy Dunlap, Udipto Goswami
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the jc_docs tree with the usb.current tree
2024-01-30 23:25 ` Greg Kroah-Hartman
@ 2024-01-30 23:47 ` Jonathan Corbet
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Corbet @ 2024-01-30 23:47 UTC (permalink / raw)
To: Greg Kroah-Hartman, Stephen Rothwell
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Randy Dunlap,
Udipto Goswami
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-30 23:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-30 22:52 linux-next: manual merge of the jc_docs tree with the usb.current tree Stephen Rothwell
2024-01-30 23:25 ` Greg Kroah-Hartman
2024-01-30 23:47 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox