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 67C5AC433EF for ; Tue, 22 Feb 2022 07:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbiBVHpN (ORCPT ); Tue, 22 Feb 2022 02:45:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230334AbiBVHpG (ORCPT ); Tue, 22 Feb 2022 02:45:06 -0500 Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CC26135481; Mon, 21 Feb 2022 23:44:40 -0800 (PST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id A57915801FC; Tue, 22 Feb 2022 02:44:39 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 22 Feb 2022 02:44:39 -0500 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=fm3; bh=WvrsQIm859hrAtjh+vD0sEGLBd9repiWMpdfcn Z3fdY=; b=AY5IzTLrQf0fZcgzx+mCmeD8ZhmcMfR249XQ27Ecam+W5+zEB8XNsi YnvL3mx0iBJbFDmHG699gmnO0zTiiIfP1hf3N9y8AJssCO3Vepx/oVQH653ddtyr lvbRN4xAtMTueJX1rpaAexXzP/jdwTAKQr8y3xyg/BWCQ610kLFK5sd9tzNOFuJv N+HqI4ISMVdjRWb4G/gDIrgC3gwG+DtdnNsLQnYfT7XD8kZK8K1NaFMKbPsYrCSL HZOYlYu7t/AdEcMoRK5tTKAnldncg/FHE1KVfUrdoXaM52RAbffXd4P6NrZ14/Hx UZwQRqc2QdSuufuvENEt16EB3eeClQlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.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:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=WvrsQIm859hrAtjh+ vD0sEGLBd9repiWMpdfcnZ3fdY=; b=QIo4pu+SgSMbqBhHHSLsg7xlZM0PgOOJg Hiq4KanJ9LmK5oVuobsKfISPKuGY/1CkdIeReQ65l7HPc7XBkYFhylxqbpXfU+zz RfC1NYyYuxoiypSsZfT4XbEcP8O4VJMlsyxv8VeRJzO5OpUahjMYfQWt3EQxLOTk wPfy/U94IKAro0QNrcxLhQhXBTEzcOD4dyWFnkZc5ryGHhI8cVesmCxhtIX0Ju+k LmI0T5iruOrllnYj4qRzfrvmy/OcH27RvPcUslvPno8coes5kA0oDekmHOWmvUaL fBTsm0Kn/ya1aFAY07K1qoSQUldq2FKdeNrFDgJOMdFyJmdOiZlkA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrkeejgdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 22 Feb 2022 02:44:38 -0500 (EST) Date: Tue, 22 Feb 2022 08:44:36 +0100 From: Greg KH To: broonie@kernel.org Cc: Baruch Siach , Bjorn Andersson , Linux Kernel Mailing List , Linux Next Mailing List , Sean Anderson Subject: Re: linux-next: manual merge of the usb tree with the qcom tree Message-ID: References: <20220221191641.1661387-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220221191641.1661387-1-broonie@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Feb 21, 2022 at 07:16:41PM +0000, broonie@kernel.org 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: > > d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period") > > from the qcom tree and commit: > > 5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period") > > 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. > > diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi > index 4e7efa97724bd,a614b9f73e2cd..0000000000000 > --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi > > (deleted the property updated by the qcom patch) Deleted files are good :)