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=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 90BA3C4338F for ; Fri, 23 Jul 2021 12:30:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7505A60720 for ; Fri, 23 Jul 2021 12:30:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234900AbhGWLte (ORCPT ); Fri, 23 Jul 2021 07:49:34 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:45983 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234774AbhGWLtQ (ORCPT ); Fri, 23 Jul 2021 07:49:16 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id ED17A3200934; Fri, 23 Jul 2021 08:29:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 23 Jul 2021 08:29:48 -0400 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=fm1; bh=+eOXjkFr/vzl4LWj2qFm/QH3AyJ 2LUE6Kqq+Nzq4Hmw=; b=aFoYCfq/zea4KY88rBSjeQ6mfQMaJ7Q2UitG3WdFFfl 1AaISfon+I8XJeogcaEMi6X9NCDmCbBGpzQ5dsMSBFD2W07948Fg+GuIcMZW3mRO r4JkKTcek5+wrClYPSEPqAZMfLUgezQUS2nXEK3Blz13qOHX87Cjt7kTfAaGItj1 IUcPZkTHkO68V6vL1T1Wa7J+rLXbmstpSZQG9zEsolqnLPzQdoKzcaR6DcBOAYJZ T+m3w8myE+YXSiIlSExkxcBkuJotDMUFir1SBRoZBz9uXEU0pObtZ0WYUcHaVte0 8Tew8g0Ui3mQ+JvQFnqxf9CpNzmkIDxIqUI+dmsSaKw== 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=fm3; bh=+eOXjk Fr/vzl4LWj2qFm/QH3AyJ2LUE6Kqq+Nzq4Hmw=; b=SFug+O5ZtgCZZnm5H/40Uv c3E1M0T8TBP8WT/e1TQ0r1zUr9YxR75Egc+bZBd4zL2obzMhXnjXXmbc8BhN7Mx7 iWQEWOMz1QFJeeE8LtcaAeXmlZI2hqVLgUAnCfIVv32JYYOfLLPL0xv/qQ7iaV6L NBHZg6ekb1qie6bfxoQeKOt3kCG9/BktDR1TglsUMJFPLm3tbuRBICUHFqMTQNUK oDjbhthAS0sLJnWG2ZjeKJE1MHNbivKcKMFYHFlJ9O8Vp524Z63Kst79hMWmKvYm HEW2sJBGhoqZB+/+wt47nNJFK9B94ESL7kiV0S5rfOB1r01bUPHXZBy2I9HW0vGQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrfeekgdehfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuheejgf ffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd gtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 23 Jul 2021 08:29:46 -0400 (EDT) Date: Fri, 23 Jul 2021 14:29:43 +0200 From: Greg KH To: Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List , Linyu Yuan , Wesley Cheng Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Thanks, I'll fix this up when Linus takes my usb-linus branch soon. greg k-h