From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FD17C77B75 for ; Mon, 15 May 2023 03:50:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238719AbjEODur (ORCPT ); Sun, 14 May 2023 23:50:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235181AbjEODuj (ORCPT ); Sun, 14 May 2023 23:50:39 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C953211B; Sun, 14 May 2023 20:50:37 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 141A6320091B; Sun, 14 May 2023 23:50:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 14 May 2023 23:50:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1684122635; x=1684209035; bh=cD iTADJk9/eFkCuGM818u4eT+ONxEvgZ3Tzb5liRKbE=; b=kv2bGbhrc5ZerLhKT2 /0JSelCFVqeFyb2LkNIpFcn5adqAXXRVja7uLiH6MAM/o1jTlEiC7CJX6FmQK0yS baFtwVMOK3zjpUWa+zESTdqs4EcS1Rq2fgYhf0xca24nWtEaMkegv6EibJbyMjL3 Fkdpc87UimLBXDeZpbVug5gB2HJstVL+Qyi2/u3mIUd/mVCRcKntTb7BAhiWB9gy zwI2bgZkaaclza+SMgRvv49fxnBNe9DvKIjH7bMXzyoxFr7MbTrwVhLC8/z/5keE wZAU6ZeErS0TpOiGh3CI2yqLy9t3DiP99I2nDlp82CgCpho9iKZGyWGnTQWWU79d h0tA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1684122635; x=1684209035; bh=cDiTADJk9/eFk CuGM818u4eT+ONxEvgZ3Tzb5liRKbE=; b=qWgF4nfvcJpQrp5HRU/worKL9nyrk 66QgMf8nI31YJn+Wd0qrc0Fi/mReZnQelH/GZ/ObTXTiBfyGS/Eucb/p+h1eO+5h HeN8X6udQpR9A4C6IlBR+Rv+9lNlaBTj+HBEHVZ1siHvBqeB1kvl+rtzn959dmhF rH7Im0CAZYVcHRcshidQKQFVM9jb8de6EPAPfVdnxNcBOe4eF4j4SBWZrb8DOij5 D8mIlrAiGAwO/rPabtPIAgoRciqbS4iJ2n8pdnNHqDisHEZIQ0NiNy618h7dPz75 BJ5ryWS4cn46ldP/I0ysU1fH2TCyroytGdQu41HoYTXF41pF/d+MoKo3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeehiedgjeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 14 May 2023 23:50:34 -0400 (EDT) Date: Mon, 15 May 2023 05:50:31 +0200 From: Greg KH To: Stephen Rothwell Cc: Krishna Kurapati , Linux Kernel Mailing List , Linux Next Mailing List , Roger Quadros Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: <2023051509-confess-rinse-6fa5@gregkh> References: <20230515123524.74e7bda3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230515123524.74e7bda3@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 15, 2023 at 12:35:24PM +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: > > c8540870af4c ("usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume()") > > from the usb.current tree and commit: > > 813f44d57e19 ("usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens") > > from the usb tree. > > I fixed it up (I think - 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. Thanks for the 2 merge fixups, I'll apply them to my tree when the usb fixes get merged by Linus. greg k-h