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=-3.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 BD06AC2B9F4 for ; Thu, 17 Jun 2021 17:32:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B5D3613BF for ; Thu, 17 Jun 2021 17:32:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B5D3613BF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=THPYKfkGwIIxLGOoyCHoUBkX3VEdihUW6GR1L7dVll0=; b=fKUY3b9IVAtoOb O2kmrOD/rtV47lpvAHA9KAW+mNmaDM0jNQNW4mKP/x3h72KZ1O663n86ToCa1iUR2S5g1l2eJPlLD E+H00im7bh+b4RHw8WYJ+OcvrkjRlXjXmIIHKM3aWWGaAxi36fvQgAAh19V1AG4207l53poaQry0n owSXpq5I2rUkAFtLxTFtA782NJFlVpz5qFW5BRWB1Ye7e78bQ5GsvtSVWs8GGgg1VhBp5t0YoN09f 41Z55r0sJ2uT1tSPCSX8/fzVHVjZ8vZ704iOsI0NDqxMD8Ay8kwKKyts3Vz8BDB0h/TRvU/GcFbSM yJWRGQ+YJxeiFcN4w40A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltvqe-00BDql-RP; Thu, 17 Jun 2021 17:30:37 +0000 Received: from mail-ot1-x32e.google.com ([2607:f8b0:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltvqa-00BDpX-PB for linux-arm-kernel@lists.infradead.org; Thu, 17 Jun 2021 17:30:35 +0000 Received: by mail-ot1-x32e.google.com with SMTP id h24-20020a9d64180000b029036edcf8f9a6so6933049otl.3 for ; Thu, 17 Jun 2021 10:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=RNIfNMMIjld5PjQjgeiM/kAf3UBf7SmlCglukGZh+kU=; b=CdoJpSLAElrrZNIhunET7FF5QeI2gVaX3/gB+100FNbF9gQ/FOoQwC4wanBs59W2e1 iGQgCOcOKy1rULH/PdnA61FcM0LZN67dZAvWcohz6Dfhzr85/SgltGngpfEk1WBCE5Rz PMI/BuX3WRtIkQGqmyz2CdEXXChlR2Z25a/49eZhFS3g6Qmo4TxbqkaJinN8Cl+IOkqK 3/3YV62ZPIaLAIAxLKRVkILYJphUzIBbVOXoJngKclkiH4yYp0LmKVvb5vWa9yIvwarE 0/SCE3szhqk9m/1mlF6ixR16YkMrqRrvj5seoMsVuIiyw0DYNiC144rBj0L0MafdGQoK 0sUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=RNIfNMMIjld5PjQjgeiM/kAf3UBf7SmlCglukGZh+kU=; b=K8ciyojYAHzwng/eSauQD8HDOSbcsL0U/TFcUYr0Tqq7vUEoXCTPlAExClFaVrjh4h X5Vos8MMC0asoTgLNVyCnbhHlSBY8N4Jb/x1aMSp7fj4D15iBUDEv6jRH6tXxp+u1CgZ sqFTIF9g8HlwsdZ/PwIdFEHhLwglrojJgUG0xMSExife871KUst0h1iG0+WcmbnwGz/v R4i4+TN8SScdPlU5wTHoZD8doFhR2vQ8lKbHA6miQXYnFap/bkoASoV9HGtHG5I0iUZy X0grMp5QfIHUMWTwHAAsQ/bxoh2E0yhhWMEQumOhsjcBL7PxGTZ46hD03CyAh0vOiEUM JhNg== X-Gm-Message-State: AOAM532jflV6UGq2fkHlpDyhk1BfzegxHZpO97/wXvW2vXCrd5+XZ7Ht Ga/KADSwIInB5zBsncQyZAb3XA== X-Google-Smtp-Source: ABdhPJzTlfvjcgyrdohPn8ZSyOe2Wk4p2iCv4NIaSzEF3sv8prIiuP7z25BdaL/CWgnh1wVm5NQ03Q== X-Received: by 2002:a9d:39e3:: with SMTP id y90mr5717111otb.257.1623951030847; Thu, 17 Jun 2021 10:30:30 -0700 (PDT) Received: from yoga (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id t26sm1433053oth.14.2021.06.17.10.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:30:30 -0700 (PDT) Date: Thu, 17 Jun 2021 12:30:28 -0500 From: Bjorn Andersson To: Matthias Kaehlcke Cc: Stephen Rothwell , Greg KH , Olof Johansson , Arnd Bergmann , ARM , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree Message-ID: References: <20210617144346.564be887@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210617_103032_858581_67698987 X-CRM114-Status: GOOD ( 26.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu 17 Jun 11:34 CDT 2021, Matthias Kaehlcke wrote: > On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the usb tree got conflicts in: > > > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts > > > > between commit: > > > > 39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone") > > > > from the arm-soc tree and commit: > > > > 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub") > > > > 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. > > Thanks Stephen for fixing this up for -next! > > One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: > Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc > tree with the rest of the SC7180 device tree patches. > > Greg/Bjorn, does the above sound like a suitable solution to you or do you > think it would be better to deal with the conflict in a different way? Having the dts patch go through the Qualcomm tree instead would resolve the issue. I wasn't aware that the driver code had landed yet, so I haven't merged the DT patch, but can do so and include it in the pull request that I'm preparing for 5.14. Greg, does that sound reasonable to you? Regards, Bjorn _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel