Received-SPF: pass (google.com: domain of linux-kernel+bounces-45468-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Tue, 30 Jan 2024 15:25:18 -0800
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>,
	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
Message-ID: <2024013009-helium-woozy-c6c2@gregkh>
References: <20240131095231.292911c3@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240131095231.292911c3@canb.auug.org.au>

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