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 328A4C433F5 for ; Tue, 22 Feb 2022 07:44:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229472AbiBVHpI (ORCPT ); Tue, 22 Feb 2022 02:45:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbiBVHpE (ORCPT ); Tue, 22 Feb 2022 02:45:04 -0500 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD1B2133966; Mon, 21 Feb 2022 23:44:28 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 636185C0154; Tue, 22 Feb 2022 02:44:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 22 Feb 2022 02:44:25 -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=yfRp+YUFI/2FMxEFyLbvDWA7xuEPRQXxUvM5Ey G2eSw=; b=eCj08t+VA37FE46gUvOLnZwouqcohh6wP21mmjBrD1zQTZBRL3Mvlo RRbsQmsMpi6qOVCvDSZoC55QILNLiGWNluAZLUeEylTcNz8npVsklxO+L5BCx884 Ru3ATtKuIaAgT+AZ1Ib2wnIieXtqFY1ZxBYrp+7SmVR2Zw5mxl+2Sg3GS6S1Fd47 ej8/WeIOEFcvw3O+Q9nCbJpqEU+cu3Vdt9dZtx9Bxrx1kn19iaZrYcu2LMoUnPBG 3bmTvGR6mftjxcRUbcqkEcSm14WZaE0oN2Dm9mQZkSm16YShQDo39bkX/9Hr8ZM6 E2FifGUMsEv6QB53LnI/rWhq6GCJZsEA== 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=yfRp+YUFI/2FMxEFy LbvDWA7xuEPRQXxUvM5EyG2eSw=; b=B3UFwwF1JJKl1U+UQUqzteo7azATfEOwH nX+ec47d0VaH/fGr6IvaozijawxsJeE9Z3GKKSbcC6YaEExX7J8I/lTqHp5rxGmd EyRmm3EHCdNkEzhNUVGrtQGLPQc6i/y286hCQapMnMB1HZUKmOhRKNRmiocG7g+B yZT52ANhuvvrDOuARDUwSDE0j2BdNrydU7g8O1Ja4n+bIqV1wc2UFcHPUwMeeSHV 88OjdAuNcTNVakMkDfXi0Ve8ObtoU9YomzheJgX5PbOAdfM+eN4GULlotQT6a0Zc G3A5g2Bc2Hjf2GWne0ZL6ZhjXsNrbsMwmyo2yEc5Ao4OFCzHLNSkA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrkeejgddutdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 22 Feb 2022 02:44:24 -0500 (EST) Date: Tue, 22 Feb 2022 08:44:22 +0100 From: Greg KH To: broonie@kernel.org Cc: Hans de Goede , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: References: <20220221203917.1899359-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220221203917.1899359-1-broonie@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Feb 21, 2022 at 08:39:17PM +0000, broonie@kernel.org wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/dwc3/dwc3-pci.c > > between commit: > > d7c93a903f33f ("usb: dwc3: pci: Add "snps,dis_u2_susphy_quirk" for Intel Bay Trail") > > from the usb.current tree and commit: > > 582ab24e096fd ("usb: dwc3: pci: Set "linux,phy_charger_detect" property on some Bay Trail boards") > > 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 > diff --cc drivers/usb/dwc3/dwc3-pci.c > index 06d0e88ec8af9,4330c974b31ba..0000000000000 > --- a/drivers/usb/dwc3/dwc3-pci.c > +++ b/drivers/usb/dwc3/dwc3-pci.c > @@@ -120,13 -119,14 +120,21 @@@ static const struct property_entry dwc3 > {} > }; > > +static const struct property_entry dwc3_pci_intel_byt_properties[] = { > + PROPERTY_ENTRY_STRING("dr_mode", "peripheral"), > + PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"), > + PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"), > + {} > +}; > + > + static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[] = { > + PROPERTY_ENTRY_STRING("dr_mode", "peripheral"), > + PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"), > + PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"), > + PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"), > + {} > + }; > + > static const struct property_entry dwc3_pci_mrfld_properties[] = { > PROPERTY_ENTRY_STRING("dr_mode", "otg"), > PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"), > @@@ -169,10 -169,10 +177,14 @@@ static const struct software_node dwc3_ > .properties = dwc3_pci_intel_properties, > }; > > +static const struct software_node dwc3_pci_intel_byt_swnode = { > + .properties = dwc3_pci_intel_byt_properties, > +}; > + > + static const struct software_node dwc3_pci_intel_phy_charger_detect_swnode = { > + .properties = dwc3_pci_intel_phy_charger_detect_properties, > + }; > + > static const struct software_node dwc3_pci_intel_mrfld_swnode = { > .properties = dwc3_pci_mrfld_properties, > }; Looks good, thanks! greg k-h