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 F1FEBC433EF for ; Tue, 21 Sep 2021 13:16:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF13060F6E for ; Tue, 21 Sep 2021 13:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232842AbhIUNSD (ORCPT ); Tue, 21 Sep 2021 09:18:03 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:58617 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231658AbhIUNSC (ORCPT ); Tue, 21 Sep 2021 09:18:02 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id D3A7C2B011C8; Tue, 21 Sep 2021 09:16:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 21 Sep 2021 09:16:33 -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=dbUvDhpn7Mt/4gcNgkWBxCS/IeN ohTfnxMLC8i2VXcs=; b=xk3oJeZJP9Y+ML8lo9R+E6NXFCeHZ8naGeKnMzhUtpO 5QxYOzWVc9c/wmP6ONSljEh+e3i9jKDS3WQtaSiVLDYkVTG8Iit5iJrLJraTOxuZ igJXkx/huutknuZqCvvdJkJkfDsk/fYxSzSOUa2TJTMgIt9Bz03OaxPQtJSMEVuU jCrFaUNtJtI942RmWpdy1TH1hTTqb401pkthoqVtFQiMrftYx4KrNTB58K3SOpfE PtMmhr/n8L2NH2zU3kLjzOIN9r0HZLb0MOrUGEpjkASEy40IWTU+4tkFKFECNOYn bEO9lPii8FHPxtbBSgLfZ1gpTcyVL61LnwCVH7hVtWA== 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=dbUvDh pn7Mt/4gcNgkWBxCS/IeNohTfnxMLC8i2VXcs=; b=fJ+NnFDeXYr539eRsBd8iM 8HjoT9xZhVtRnPN6Ez3+WRAS0qbnq7D+nwftpxfrvz+FQ3CUFBgh8DTw4WdRFDwb u55gmLlBSRRgdkAuYGlxJZTmbZbuxgiIkuCNPetYdsVymGy5MimMyEj9OrTmysaE 59s1Pae/gd4cZ4+TpSaC2PsERGqru5r8AbeieP5DNA1FejSreTimtZX0bIHKTAlX fBUubxtpIpFtQqV7RbiAh1plQjE/+rw5ZnLfrmRNDGC+obaCqqHhGj1732GOOUzQ rg5hZLstZ4Q13Z5wIW0t+kIOtKTGdIf2cJNR3dPjbuQmSkL7iW8COYC//6b4ZMmg == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudeigedgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 Sep 2021 09:16:30 -0400 (EDT) Date: Tue, 21 Sep 2021 15:16:27 +0200 From: Greg KH To: Bjorn Andersson Cc: Stephen Rothwell , Andy Gross , Baruch Siach , Kathiravan T , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the usb tree with the qcom tree Message-ID: References: <20210921123032.02cd498b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote: > On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote: > > > Hi all, > > > > Today's linux-next merge of the usb tree got a conflict in: > > > > arch/arm64/boot/dts/qcom/ipq6018.dtsi > > > > between commit: > > > > 261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description") > > > > from the qcom tree and commit: > > > > 9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description") > > > > Greg, this is not a USB patch, can you please drop it from your tree. It was sent to me and says "add usb3 DT description", so how am I supposed to know to reject it? I'll go revert it from my tree. {sigh} greg k-h