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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6ECC7C433DB for ; Mon, 11 Jan 2021 07:11:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41EC8225A9 for ; Mon, 11 Jan 2021 07:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727610AbhAKHLF (ORCPT ); Mon, 11 Jan 2021 02:11:05 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:58103 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbhAKHLF (ORCPT ); Mon, 11 Jan 2021 02:11:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 36A5A216E; Mon, 11 Jan 2021 02:09:59 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 11 Jan 2021 02:09:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=TNeA/yTsR0+oK6Ng70juGZgECWI ptNKcAMCaYK9UAPs=; b=iFpiPHr8Hb940k+DDO1pPdW6J1h5h46J7f/zTYHgKR2 0rcuoMtP5ZR7OvmM9s+JMxOqUC+yYUDLdTmByHxe99k04NlnnyW6ZACIG5u6LdG0 0bIUlY51h0AOLgWyt0rKXw52ZJZ3WIiUioDdvbF34HKxHGEUdL016yelSANWFT22 ATEopLNjsMb/Ejy6t7A0jV6qjdFgVziGgR3NQpTG3atyNQmpz1/XrY9Tedum3Sqc 3eG5ssNjHkIgH4K6lDEyHVHtZ/cNXx0/t93ljWAoi66Wz33jX5dqCfZyTbA3vVae e7DlNLaaM8wFY0OWLD0/Zohnh1ec22VyzPRS0ng0h4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=TNeA/y TsR0+oK6Ng70juGZgECWIptNKcAMCaYK9UAPs=; b=oAG+Fbf3apGjAuFBiMOKK9 mVUURGPWTU2Q9HnqH50IM/l8cC/+rmB5WtGV3oKtInkMeqTNaycK6Q5CyXV/LZnB lZ+imON4KvMTw1fDbReNalWTHE3xlS0/JdU83GCfNYW0xp+uwvZcSsiUWNxvVSsQ DpdIjlgkszDzfX4aKC+th4A1sS7mc2kIqetVgqcGTU7tkMkipDEFhJJY6aZEw/P3 x6mQuOhNNWju39jK9NUBATZ0Qmp1lzhm35dmB9QAyTJb5mqUFXqB+mSKFdRVG+rm nyXMGfbHPK+XdPdW0SnuZUIbqjnETdg8I+XeW5vz7tGfqZ8KnfP/wqZa4PJH8MOg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdehtddguddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuhe ejgfffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecukfhppeek fedrkeeirdejgedrieegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 1EC8C240057; Mon, 11 Jan 2021 02:09:58 -0500 (EST) Date: Mon, 11 Jan 2021 08:11:10 +0100 From: Greg KH To: Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List , Wesley Cheng Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: References: <20210106115014.28009565@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210106115014.28009565@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 06, 2021 at 11:50:14AM +1100, 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: > > a1383b3537a7 ("usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup") > > from the usb.current tree and commit: > > 77adb8bdf422 ("usb: dwc3: gadget: Allow runtime suspend if UDC unbinded") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/usb/dwc3/gadget.c > index 25f654b79e48,85736dd6673b..000000000000 > --- a/drivers/usb/dwc3/gadget.c > +++ b/drivers/usb/dwc3/gadget.c > @@@ -2146,8 -2212,7 +2213,9 @@@ static int dwc3_gadget_pullup(struct us > dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) % > dwc->ev_buf->length; > } > + dwc->connected = false; > + } else { > + __dwc3_gadget_start(dwc); > } > > ret = dwc3_gadget_run_stop(dwc, is_on, false); Thanks for this, should now be fixed up. greg k-h