From patchwork Sun Jul 19 23:04:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11672681 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0295560D for ; Sun, 19 Jul 2020 23:06:50 +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 C52CB20738 for ; Sun, 19 Jul 2020 23:06:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qSlGo813"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PRbaQE3+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C52CB20738 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+patchwork-linux-arm=patchwork.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=SSOzf51QxLdWOrQ875wZGeuaNkPDwjex87aQjzPjmeE=; b=qSl Go8132ke/8ZdEXPMo6TdZr00kDnyyaB//p9zwaSDjfIDPab4oNNDN4P8YCi4EOkmXmwKLNV26CLCf 8dxg7fUIDuVDFUBM2C1Y0kEiuzOK3EAKRWCdlV2XUoni/BZU2gQLQF7IABbzp/aLTQ83xNYp/7GJp ZrH0DTW37iOFnPShvCSsQqeKUUf1j+OcZqD31ewcs3CVM46+kNgTYVF3g6HxJHwnZx2CRAf6DG5Kb ESyGhYkw8VZu4ZQFpT2zP2EBnZgS8UbbHYXOXHG2bZvJYxzGEm2ZNplVihBWkn9yN9OAc+GbUCapA 564xpB5UyOrENQxDp3TNdx8JlNwIdqA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxIMi-00016O-DA; Sun, 19 Jul 2020 23:05:04 +0000 Received: from ozlabs.org ([203.11.71.1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxIMf-00015O-3R for linux-arm-kernel@lists.infradead.org; Sun, 19 Jul 2020 23:05:02 +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 4B90mw6BWGz9sRN; Mon, 20 Jul 2020 09:04:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595199890; bh=D+5rkaJRkU+g9sxinJrCl4G4sduYGPSSa80PlqhZDIQ=; h=Date:From:To:Cc:Subject:From; b=PRbaQE3+6Aa3fHXOrBVRgcXOs2BnPD9x4ns6grcAcF70uxTdYrlNjm9Wnmb4RUu3T mMFSsVWJUAvziOTzioEraSZO9pkwT3+pzbCJUzSCQJ72N/ZM9xAXwOtbQX1/Bt2sql NVQHJFCVpiSFzR2bmx2+C654mELYElmLTMd0eajNOvYAhBJDT92dUIQ++/kyoXqa0l NgwH05kuyzzUutuCN1a/Ms/15Af3XPsybcc3EOMoGSmyKEian4UcoO2wRT5RrgG7Z7 fdYo5SdMlAG4BOg/6Q1cledJP69oY4wkhvKdwm6noo3zVS8/o6Rdhhsab7+g0g/yYl sIgFjO7K48IdQ== Date: Mon, 20 Jul 2020 09:04:47 +1000 From: Stephen Rothwell To: Colin Cross , Olof Johansson , Thierry Reding , Arnd Bergmann , ARM Subject: linux-next: manual merge of the tegra tree with the arm-soc tree Message-ID: <20200720090447.0a4f74ee@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200719_190501_737529_96D7E409 X-CRM114-Status: GOOD ( 15.76 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Enric Balletbo i Serra , Dmitry Osipenko , Linux Next Mailing List , Linux Kernel Mailing List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the tegra tree got a conflict in: arch/arm/configs/tegra_defconfig between commit: 67c70aa86f8b ("arm/arm64: defconfig: Update configs to use the new CROS_EC options") from the arm-soc tree and commit: 3a3cb021b038 ("ARM: tegra_defconfig: Enable options useful for Nexus 7 and Acer A500") from the tegra 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/arm/configs/tegra_defconfig index 8688c715ccde,729069b6d34c..000000000000 --- a/arch/arm/configs/tegra_defconfig