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 3DCF0ECAAD5 for ; Mon, 5 Sep 2022 06:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235782AbiIEGFF (ORCPT ); Mon, 5 Sep 2022 02:05:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231883AbiIEGFD (ORCPT ); Mon, 5 Sep 2022 02:05:03 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 660341A3AE; Sun, 4 Sep 2022 23:05:02 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2DFA75C00D9; Mon, 5 Sep 2022 02:04:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 05 Sep 2022 02:04:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc: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=1662357899; x=1662444299; bh=9rwen180LD zZkPZ/tp66Cb5V6hBq8lpuh4wpolRlS8c=; b=ABO7UC5o2e3QKa8CtyH2uXGZlu ReZDE8KAxS31qGLIN1mjNT3QJhxJRv54KPK++zu1+2nBjsyFrEew1cOlrSVqJIyL 669ujOAT/C08Sv8wl6PDxGLubmULkcyXDEWqBD80ZMeRBq1MeETTg17E0wkdp6Jr ea6fvlgKUmmqZ0UZy1gfQqNhaSQtLF43i/4vVfmQEZ4N4KbT/ANBS5SnGJeXIVoI 1SFKW9lJ8TfDUMpjCVVxDlgBt1aFq6iHw/ic1fGsiyfkCydpuh8o1BRhpWCB1iuj UTcaMwO3E/eKAYcWbV62YGQB2q00Zd6SVTW18316dtZD03Fs4R+E0pUGWYfA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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=1662357899; x=1662444299; bh=9rwen180LDzZkPZ/tp66Cb5V6hBq 8lpuh4wpolRlS8c=; b=A74SvdjwRTYL2Z4LHuR7BagTAvo5/gA49tM0888usoFF iHacArVvNH+ilEqByFNjNcdwfpeXwvldx9EkVvYLQ2DlF9okXOGirl+/VQzdEURP h2zQuu9QCsKpVIuc29uTu3zoq6q2Pm0T3GUG2oXPhqnRmmsBQQUL60QYpLEDJYd6 YJPC8pN3FLaAcNwYC0qmM+DuNBTFIt9G/2pHPrUwbuRtv52TXTz0RFUFUceMO/6b 1h9c82EGueRJ/ye3PAFPYsptAt0gg0reQdJfL+ouSgegk3/17QTqsDIFXlwGA+/w FpomSU53TMS2PbXG0jR+CtHEN+sR9mGSCYAc9h5eIg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdelhedguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgv ghcumffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeehge dvvedvleejuefgtdduudfhkeeltdeihfevjeekjeeuhfdtueefhffgheekteenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhroh grhhdrtghomh X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 5 Sep 2022 02:04:58 -0400 (EDT) Date: Mon, 5 Sep 2022 08:04:55 +0200 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: <20220901135230.37584d32@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220901135230.37584d32@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, Sep 01, 2022 at 01:52:30PM +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: > > 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop") > > from the usb.current tree and commit: > > 9711c67de748 ("usb: dwc3: gadget: Synchronize IRQ between soft connect/disconnect") > > 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. Now fixed up in my tree as well, thanks! greg k-h