From patchwork Mon Feb 1 22:01:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12060153 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.1 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 33825C433DB for ; Mon, 1 Feb 2021 22:03:05 +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 DD10264E2A for ; Mon, 1 Feb 2021 22:03:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD10264E2A 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=cCDVYqFW+8H0T4i+X/Fj7qdunURoWGqAmiz2P5bMTWE=; b=J9C Rcy1rq0vteP89WcuJnTq4zQwBuRAr4pmp9OOhCOtqmYHjg6SxzCGCo3Dl3KmvzWZliN/zAkehJCl6 eH5Y4v8Pi8o56TB6NUAMHZnDj6IzMMOyUj7Mo8xgIZApunM4XuICyunVosN36Sh5FAu5HnZfqaDzI lMrzo7Y2FUkjzf23FyAylKEvLRcKCFo+i42exIMGLGh7oPgnwbWJAJzT4V31F6Z3YiY59kfqcFE41 STWjs+6SjQYdWpqiICXAt56GfLMi1CxAtD4prjCXpASmcuWCt9ftKW85dpW1etM46XY3oAz80HbIL 9QlzknkHPYUyaU49ZtDnWpHyzT7Qj2Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6hGV-0005Ov-CN; Mon, 01 Feb 2021 22:01:47 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6hGR-0005Ng-Ig for linux-arm-kernel@lists.infradead.org; Mon, 01 Feb 2021 22:01:45 +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 4DV23404Gdz9sWK; Tue, 2 Feb 2021 09:01:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1612216898; bh=Z/E7/rh7iCFGXJ8hnViEZGF0FoCwkY3iql5unOXlC8w=; h=Date:From:To:Cc:Subject:From; b=hqvHiLRv9Nn21+MNm+eSiUYb/In93jQPHbebE1JfdYcwU9cMfdr5HphJm5gvcLQf7 mOeNolswp84ObwjB/5Ela3t7dp3XmZhNT049cFAwUGBK5cOxKnFmFM9x1zyOPcRa2o rulIS4sAdOvHtZ7k0xiyq2pmYtzfGkRA3FiIhhTww9gcrTiyeDyz2BAn3fAj1PJ7IS bt3pafHOvdnswBWAUzbMjtnmKC5t00K8HrO8e/kw9TBaK5FB5MpS9LVYm51KGlY0Od FBBjc6RKM9IBHTnkMLAvxgS8tJIEfMFojEkeWpchDFyaxgRLkUBdXdgntzFJidBVUQ qfebNlbXp9fpg== Date: Tue, 2 Feb 2021 09:01:35 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Russell King Subject: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20210202090135.04b9890e@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210201_170144_692240_2C9B0239 X-CRM114-Status: GOOD ( 17.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: Linux Next Mailing List , Linux Kernel Mailing List , Alain VOLMAT 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 arm-soc tree got a conflict in: arch/arm/Kconfig.debug between commits: 9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART") 6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support") from the arm tree and commits: f3a732843acc ("ARM: remove sirf prima2/atlas platforms") 89d4f98ae90d ("ARM: remove zte zx platform") from the arm-soc 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/Kconfig.debug index 7a8697a97c98,c36c5d4c6e9c..000000000000 --- a/arch/arm/Kconfig.debug