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=-0.8 required=3.0 tests=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 888D0C433DF for ; Thu, 28 May 2020 10:49:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 62900208A7 for ; Thu, 28 May 2020 10:49:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="mFy4UDTe"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="QoqKY70q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387981AbgE1KtY (ORCPT ); Thu, 28 May 2020 06:49:24 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44067 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387956AbgE1KtX (ORCPT ); Thu, 28 May 2020 06:49:23 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 4BFFA5C00B7; Thu, 28 May 2020 06:49:21 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 28 May 2020 06:49:21 -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=fm3; bh=hgsbWFTFRa7V/NvC1LMIAVfvjxl pp+elvkKIVGlbGSc=; b=mFy4UDTebigc5WdHzbN+ysdAEd9SzN1hZd5rTSlxiYU YwWzfl3rRlFGkgHypoPHwI9F9wpJ750OAVDflYyc/a1gGjuMUPVLUjaayhssabfU z+a8cO3v0sKiMNSTsnr/02UQGUkA6dp5tp/yAo+8TIaQwR3SigLDLrW6RwBfGhhv qsC2+J7rHM+vMraokDdddXAg5ANqVm+ToHR9hMCfW1ggRWoZK0vKbjiE+FhRkinR Z7SusOoLKMbp4tRO+QsvW8g93xrd1ercWSEKxtUJU7pWyBDJd1Aj4eSQ5pXf48QG KDPnqdJjoMDRWRGVM/9TiOqzhfbbJuB+2keup9L7PvA== 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=fm2; bh=hgsbWF TFRa7V/NvC1LMIAVfvjxlpp+elvkKIVGlbGSc=; b=QoqKY70quHd0OfCgn3hQS1 tCa0N6TwSlnmYRwe2IudTorvpIlf3FWZceEUuzHW5yABTd6b8Kvy2Lq3yYfpt9Ob 62c8LMYT0yKJBkICwX0MiptO1qGiyO7H93yrfpzc0k2qvui9M9UKrwAVb5WvblSt z9a3aRa2sILBuSKG26YbXJ6GFfY9fQFF2qWpCdOq2scP9/Qp+yY7TMnfLZyiEShm fbErAa1hIma/CpBh3qWFHWZZ6gebVN1/uzdZgMr/0d1cpveaTs/Ly3RMf2tQA/op ZD74L9hUpsM2juBeL4goRPDaq1z7i9ZNtyxEKW0Bg0tT1wGHu2VlVFlwLkUEkTfw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddviedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucfkphepkeef rdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 00C843061DC5; Thu, 28 May 2020 06:49:19 -0400 (EDT) Date: Thu, 28 May 2020 12:49:16 +0200 From: Greg KH To: Stephen Rothwell Cc: Rob Herring , Linux Next Mailing List , Linux Kernel Mailing List , Sandeep Maheswaram , Felipe Balbi Subject: Re: linux-next: manual merge of the usb tree with the devicetree tree Message-ID: <20200528104916.GD3115014@kroah.com> References: <20200528162215.3a9aa663@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200528162215.3a9aa663@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/devicetree/bindings/usb/qcom,dwc3.yaml > > between commit: > > 3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings") > > from the devicetree tree and commits: > > cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings") > > from the usb tree. > > I fixed it up (I guessed, taking most changes from the former) 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. Sounds good,t hanks. greg k-h