From patchwork Thu Jun 17 04:43:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12326475 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=-8.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 B9DA1C2B9F4 for ; Thu, 17 Jun 2021 04:45:27 +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 7B2EB601FC for ; Thu, 17 Jun 2021 04:45:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B2EB601FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au 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-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=xc8p7MtNsTIYxL2z36VSwhdvlWGM4c8jlUzyi9gbKKc=; b=1tH 5rD93FNH9IvV58jrxIzBJmtmugx1JgTeI5o6i2SaHs3tGdemCfJcKkKVfzJVpWbOosmTd566IBx2v IhwvhC00lMUQ9T4JVYqgWoiVYLAj3Wah+Z5FSDuJyWWWB3DXvKbZ9YHlEymf6QXlrH7aMhw/EI4XH McPiIgdALHLCDGOb9N+dlc9vJzs7/hT+VXZAa7RkUpSG2gJxjeaYl9m0ubMppUqI5akKhjaeLKCD2 wd9b8iyWcSvtMH72ZSBnj9prcPcU0TIb+OgyhqGVKpd1tJv56++dMtSLrRQwI6HGgHoqVOMpfLJ1y D5nl+7766sCI88w6aeiswAAZ8LFcWEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltjsj-008lwo-Nl; Thu, 17 Jun 2021 04:43:57 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltjsg-008lw1-Hk for linux-arm-kernel@lists.infradead.org; Thu, 17 Jun 2021 04:43:56 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4G58Zs498Pz9sW6; Thu, 17 Jun 2021 14:43:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1623905031; bh=YYZQRTaEz+8GiSnTFk9Nc8Rsg78+vdZcMemhOChNeBA=; h=Date:From:To:Cc:Subject:From; b=KBhDBqcg+IGpXAhHRn87yNWvpZOJ5M9mvOSerBFkzb3begNXASKK4C8qtduyp2mXw sXOs1p/uk7z6zx1BTTUvLJm0QVF/70MBDEjJTeBbxZNFOZnLl636bolBqEUnbP6/K0 VyDbAJMoHGEo1KVhv6wS4smzM80UxYIiugOBaZ8TtanI1c4uDQbFIVux41/qoIMPOl ONDMdobyk1A/Uo9psTL1JhqdZIua0tfFRceKKMDlEcVVA7Y4nRYUYOEoHi93z77fkz w7SdpdOkdnIIRGKsylNyOiSNWXBUSbVA2MxyJyYrdtTtCVZ9AT0R5bVkU/Ke/e+hup JcAkZXLG5s83g== Date: Thu, 17 Jun 2021 14:43:46 +1000 From: Stephen Rothwell To: Greg KH , Olof Johansson , Arnd Bergmann , ARM Cc: Bjorn Andersson , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Matthias Kaehlcke Subject: linux-next: manual merge of the usb tree with the arm-soc tree Message-ID: <20210617144346.564be887@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210616_214354_788318_B5099C25 X-CRM114-Status: GOOD ( 18.29 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4,bae85f6b2bfa..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf,343ed457efb2..000000000000 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts