Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp463806ybm; Thu, 28 May 2020 07:19:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgALY3IKG81jDZHMPBniRgfH/uitNvDreA+8DwVLU466weLb99rWLrA2gd3iRGNLXThpst X-Received: by 2002:a05:6402:2216:: with SMTP id cq22mr3422980edb.167.1590675565718; Thu, 28 May 2020 07:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590675565; cv=none; d=google.com; s=arc-20160816; b=00+ZemyL2b1XOhc4nAvL9ROT/v9PCxqwyJDn5dQUhcqDxAzr7SavZrUJNLcOf2JtPp bZCfCdBQ7ibM97o2zizaleYF2R6PUptGH3uSaKTNFEqrk+TAqnTPVLKlzbVMjJ8ig45X 4QPbQ6AX5PFEGA8/Tths3ZTv3tlQl2ncoOErTYX4UCmTCsTvVkWioJ2EISUj6b8sVa9V kop44V3PA/xA9X5J140xhDUYAg0ZtCuKMasJeh3DfVoBMq+sEtTaDTt+4J2T0dZl3qyy dPadV5XZLuggnwOZCMyBPYBqIbJbgCrPq7p/Ycaa0GTno/5KV0JVOVFojuI5Jm+ETvpO 024w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=SyynWlYFcaOqFB3tjQeSxVvr8sMjk+dE9KsVMLkNf5w=; b=HY9nBQP2pzkkQQPHL36S0+ZYsWg22FtnFwB99oUdtCEqXVzWvIHtx8HREMV+OvUWrm bhiRf5qkrR+RD5jwdH8EW7zh496JfF6sNqcfzemh57dzzXy3YA8oR+GV+r/rW6fov8Qn acTTX/hK8OF7Voai0ylqLNOTeveKGozyjwkw2ZEE0kucP/79+3NY2n80Sr/XlOZDc2XH 7irWwejb1ENXf9cSrvG3uR6C0HzTL2Th5FzpBal1hh9+wOrqyaWELiBcniURsgER/vnJ m2wjaLEe9g8FDFOwjx6dfXDf2kveAhWkT+kSWf5MH+eY3DUgGYiWH+xXLpM8HqPUr+2P BIoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=HGw+Y4v5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v7si3737542edr.33.2020.05.28.07.19.02; Thu, 28 May 2020 07:19:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=HGw+Y4v5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390944AbgE1OOv (ORCPT + 99 others); Thu, 28 May 2020 10:14:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390932AbgE1OOu (ORCPT ); Thu, 28 May 2020 10:14:50 -0400 Received: from mail-ot1-x343.google.com (mail-ot1-x343.google.com [IPv6:2607:f8b0:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2D19C05BD1E; Thu, 28 May 2020 07:14:49 -0700 (PDT) Received: by mail-ot1-x343.google.com with SMTP id c3so2428946otr.12; Thu, 28 May 2020 07:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SyynWlYFcaOqFB3tjQeSxVvr8sMjk+dE9KsVMLkNf5w=; b=HGw+Y4v5NkRoIY0/xn9YHGq9FGwkaN2diCcilEjFK7bqat7dPLeflJgjQc4Wy2H4t6 uKurL1UCvRF35zIjxS6GRQk15msdZrPGClJxw07gYncIhQrv23GGSCfFU7KanoILEx4M rWXS1ntFI69zCCuaLlw4LloUlZyFdRzRjrp3Phv2ApasM+s98Uz2bCgus2XpM3nvRFdP osIhQSgMegzFKe4B0oSSayp10VJI09sJyJmwaTbv948cGAxzk7rFkNj9/vwL6/ZxsKp0 chsDF2W7+iaXVMFA6JvYE81D3eZZE7VbfAlaVLJDPPdWIXDxSIpd06zQvo78gsOvmAXZ f9wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SyynWlYFcaOqFB3tjQeSxVvr8sMjk+dE9KsVMLkNf5w=; b=ne920CSdMQJuDG7gcov2B52qt1Fp5UZ39GHqI8DcgSLcdQFqTWsXfQ4jHSVrnCsWWw gQsMfzYF9fpT1WJOcunE5k72ZxMUdKlBgWNZJPSXUnnakQm3MrXY8W6QwMxi/rX6FgPm UlLxtxaVnZed/xZUs0QPc9bg+vI0nwvznVzPQ92Ik/aPH/DVj5OYZqYyC+TZwuZ3kGjL 8pWr6ZskXsn21ZFmqUg3H1bdnfhCHuwC+AzFSodAwGYeu010J+ge+n+jropNOaKW+tMy xhOINM6tdMgiAE3K25tx7qJcIkPo+dFsfKSxHGMBv3ansrt/p585kvTxaQDPFLqo2eUv A4Sg== X-Gm-Message-State: AOAM530CvURwG2CBptoCUhY7KSkpInxLE2V8Eg4WPWb+/hhdHc+gM8OT S6Mqnr7B1xVMuu5bwgYcYQF0jwwl//DTVVe4VGgA X-Received: by 2002:a9d:51ca:: with SMTP id d10mr2418626oth.129.1590675288045; Thu, 28 May 2020 07:14:48 -0700 (PDT) MIME-Version: 1.0 References: <20200528162215.3a9aa663@canb.auug.org.au> <20200528104916.GD3115014@kroah.com> In-Reply-To: <20200528104916.GD3115014@kroah.com> From: Rob Herring Date: Thu, 28 May 2020 08:14:36 -0600 Message-ID: Subject: Re: linux-next: manual merge of the usb tree with the devicetree tree To: Greg KH Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Sandeep Maheswaram , Felipe Balbi Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 28, 2020 at 4:49 AM Greg KH wrote: > > 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. Ugg, I fixed up a warning on my side... > > Sounds good,t hanks. Greg, can you revert your copy and we can get rid of the conflict. Rob