From patchwork Thu Jan 28 06:03:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12051813 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=-9.0 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,URIBL_BLOCKED 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 752BFC433DB for ; Thu, 28 Jan 2021 06:04:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 1B2D264DDA for ; Thu, 28 Jan 2021 06:04:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B2D264DDA 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=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject: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=mJUufQ6JgqKDxGuizmN3jJcQ+DEJks7inor7ud6LFyM=; b=bLN CDnqIQC4Afafr0f73heHY2qa6lJSGl/NNmr8c+jpY49ssg3gDwPq8FZ61r8HUQI/RQjFy4kyhXRcQ B5ddkmQE2grpR2zoINql+dBLlWGD34swCR/ZchKYT0M1ogVr7WeD/Pjo7thf7yNJR3ooyzqglk0qd TWHL1Yq+USYvW4+ressUBXHOgToq9ppnO8loqMchq/bqmZKKDO0Qd6xRGzveHLvvBkWcwKfe/WDhr lorK7qx32/wTWPrEsnoYpzDGg1PkALAS9dqlcc6gQoHichtGbtjFwywmqafyuZLTICJxkXiFaFGNl Uz4NLCJOxr0nm+PDc23qhOTrh23x+4Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l50PF-0000o8-N0; Thu, 28 Jan 2021 06:03:49 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l50PB-0000ik-Gq for linux-arm-kernel@lists.infradead.org; Thu, 28 Jan 2021 06:03:47 +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 4DR8zT16k5z9sCD; Thu, 28 Jan 2021 17:03:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611813817; bh=JaUncBF/71yCM2cUZVv1OMD7g2Tr5z/tA6Ku1wEyQ/E=; h=Date:From:To:Cc:Subject:From; b=bnJHfCG+/Pvd2eHiBvcZGhvG8Zt1AIekwiBwlK9MAJVY7DkGBE7wkL37GWotSWHVM FGqTczb3WgzZH3Rh6ojVRfdG4hIkoVl8n2U1g01OavrluvZFcvE5S9Y6j1PIT/+XvV reCXqYPjnmFc3XXvoB+EvVCzjhkZ/qRbWvm/ngK2s/GCl/LNKIlXz4P0p7Vq7xt/E9 FMIrbwSlLgx7prJR+ljjZAqngIHgKCPvudXlvz1dkg+a1cZS1tWN2jYkyg3fMzQ0jT 7flOEtTey4cahNit/ufgCAVStmeSYt0NdvHI9dnT3RhoFNkEpX0PBVs9K0OtCvd8sz VQu7PdyN8PeIQ== Date: Thu, 28 Jan 2021 17:03:31 +1100 From: Stephen Rothwell To: Bartosz Golaszewski , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Message-ID: <20210128170331.4f2ac87b@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210128_010345_933099_79D6B999 X-CRM114-Status: GOOD ( 15.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , Nobuhiro Iwamatsu , Linux Next Mailing List , Linux Kernel Mailing List 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 gpio-brgl tree got a conflict in: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts between commit: 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC") from the arm-soc tree and commit: 08bc3941b6a4 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver") from the gpio-brgl 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/toshiba/tmpv7708-rm-mbrc.dts index 37da418393e0,950010a290f0..000000000000 --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts