From patchwork Tue Feb 16 02:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12089399 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.8 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 D31B7C433E0 for ; Tue, 16 Feb 2021 02:07:09 +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 8850964D9A for ; Tue, 16 Feb 2021 02:07:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8850964D9A 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=3w/knPSmjOypnqZ0a3qlI5Xz6rkil1m9sj1NBs0hmhI=; b=Pgj YJ+ZSi95WZH83jqS+ozJ462SBnnQdIkOiqXbcwfsxEQZRpK/uZyuwdWxIIHDIYw6lnJgKbROiuzva D9OaRLYVN/Ri2npoDCPo+v8IC7g6i49gYeIYAdmpqccVoR1lPSGvYNOQ4DQbTBSltiE2LGQbDfOAR bjDg4ec80fWzk7NuH+LDpShLEtjc/dLaQYrIpdvTVt3UJyRs6P3vp/MhohoTHCCM/vPeMMkofWX9i OtFGJWFhrf/oGW2qu88YdEG8d5CoGnGOFIlPMKOkq5psGTKKnOMGUujqk9xPQjPxP4RqgS5JD1f4m Il6sBjZgAqHLQS9iIrQbml6lkuVQFxw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBpjm-0005qN-Qo; Tue, 16 Feb 2021 02:05:14 +0000 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2] helo=ozlabs.org) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBpjj-0005pk-P6 for linux-arm-kernel@lists.infradead.org; Tue, 16 Feb 2021 02:05:13 +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 4DfknH0vRTz9sVR; Tue, 16 Feb 2021 13:04:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613441099; bh=kvCcIU1t45YHZth8tA+kMgS21Ahdt4LFOatlqMWBQIQ=; h=Date:From:To:Cc:Subject:From; b=We+Qpfac7qm3Mp5ItKtb5TTIfodvAOIkocJ6SU5VlNwKRZj6l/NgLEtrIG8y4WKCm suJ94IcSj8Kcu8C0oAszGY72GdXgNa4V/XiNJSuoRTZmgpXRSau3HZcXRiAJqSrPdo V/ag24wa4yePGUr/w3l3LwHdVvcTMsubOzC3XbgN8iJ+BgdEEy8JSYGA18Avoaxt0v 07COM7yOzyPBJRbLrW/48a5NB4zHXp3H0fn+kIo0e6xCTStf3Cahc6dPt9dpOnQ4oh uveoa6ZqNJjpvgAoU0ZHMPMHBjqddZ9yk82f36c01/mT/GX6tz8E/O9ZzjcbjnlYEU 1SzCkfymJQOpw== Date: Tue, 16 Feb 2021 13:04:49 +1100 From: Stephen Rothwell To: David Miller , Networking , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the net-next tree with the arm-soc tree Message-ID: <20210216130449.3d1f0338@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210215_210512_320152_99B88A50 X-CRM114-Status: GOOD ( 15.97 ) 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 net-next tree got conflicts in: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts arch/arm64/boot/dts/toshiba/tmpv7708.dtsi between commits: 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC") 0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver") from the arm-soc tree and commit: ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 ethernet controller") from the net-next 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 2407b2d89c1e,48fa8776e36f..000000000000 --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts diff --cc arch/arm64/boot/dts/toshiba/tmpv7708.dtsi index 4264f3e6ac9c,3366786699fc..000000000000 --- a/arch/arm64/boot/dts/toshiba/tmpv7708.dtsi