From: Jonathan Corbet <corbet@lwn•net>
To: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Randy Dunlap <rdunlap@infradead•org>,
Udipto Goswami <quic_ugoswami@quicinc•com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the usb.current tree
Date: Tue, 30 Jan 2024 16:47:46 -0700 [thread overview]
Message-ID: <87le868jtp.fsf@meer.lwn.net> (raw)
In-Reply-To: <2024013009-helium-woozy-c6c2@gregkh>
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
prev parent reply other threads:[~2024-01-30 23:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87le868jtp.fsf@meer.lwn.net \
--to=corbet@lwn$(echo .)net \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=quic_ugoswami@quicinc$(echo .)com \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox