Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 27 Jul 2021 16:45:27 +0200
From:   Greg KH <greg@kroah.com>
To:     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>,
        Linyu Yuan <linyyuan@codeaurora.org>,
        Wesley Cheng <wcheng@codeaurora.org>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree
Message-ID: <YQAcB5uImRXg4gs8@kroah.com>
References: <20210722141228.57a92e94@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210722141228.57a92e94@canb.auug.org.au>
Precedence: bulk

On Thu, Jul 22, 2021 at 02:12:28PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/dwc3/gadget.c
> 
> between commit:
> 
>   40edb52298df ("usb: dwc3: avoid NULL access of usb_gadget_driver")
> 
> from the usb.current tree and commit:
> 
>   9f607a309fbe ("usb: dwc3: Resize TX FIFOs to meet EP bursting requirements")
> 
> 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.

This should now be resolved in my trees.

thanks,

greg k-h