From patchwork Sun Jan 24 22:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12042659 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 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 95CBAC433E0 for ; Sun, 24 Jan 2021 22:14:55 +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 5009E22C7B for ; Sun, 24 Jan 2021 22:14:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5009E22C7B 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=bClqnU8WasOogiRtOFjVu720vLGsBJguggsfhUDv+RY=; b=NiC qgFetEdPbuA00BUQo1s6klH0+lWznA4t8ybPWpPpakdtDi9cYZqX+Vslpm/T1CXuqj14S4VipV2R7 9ELI9eAdplhgSdHV4iZxDnVfVguZmHLCDlF+SYO/jXrvWVBJBQtx/C72tIfNl9ScQ5uw2Usurin2I cozwaE9mBiKDgPgX+u++4vSoFsKGvelkSjXRmmSAoaIAHiZGoN1VqSwWrSOtGiAdXBZoZ9KX4Rjmk tFboW62kEs9yobVjv95IKidp9uCS0hw1Y6Wmdt+2ZBMb6mtAodLO9nz/j9slV7/iNucWQaJFbXx1A P/xgG5+4eDQtn66g92tOqGqAUXDAjtg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3nd6-0002AH-VS; Sun, 24 Jan 2021 22:13:09 +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 1l3nd4-00029v-1q for linux-arm-kernel@lists.infradead.org; Sun, 24 Jan 2021 22:13:07 +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 4DP6gr73S3z9sCq; Mon, 25 Jan 2021 09:12:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611526379; bh=36Efgo471+gWYmzqkjsoTsfwF1GbFwhMUd3KUpYDbnk=; h=Date:From:To:Cc:Subject:From; b=EGPul2dxN87wS2w/WfPs566i33E8DYBIbjqln2SjwTYkdg/bC59oL/2AS3I5STmqL h5U9S1SiH1O8i9qNDDigxHJCy0J/loHb1nUZO+ySjhtTmZrjedG7o+MK1M26Z5fYlT q253kSfq3ZySuGXoFPefPR2kEJAw2gK7avXb12vFf6KCCFt4Ug8N4bCB7a2J7H1bE3 1dU/vdW/ABvjEQmWRdoy4k+6z/fsgZ5bQwp2Fmf/jQlpu3mg95U9xfITxFsPRfBn9m if8uNOuT8VDt160Ut91BGR4fCAP1qYYsZsEd8mfd2jT60j+kfcfqsSBQCmaik9kq1y YA8Kh4kEG30KQ== Date: Mon, 25 Jan 2021 09:12:56 +1100 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the risc-v tree with the arm-soc tree Message-ID: <20210125091256.302fd411@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210124_171306_664756_F80DB966 X-CRM114-Status: GOOD ( 15.79 ) 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: Palmer Dabbelt , Damien Le Moal , 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 risc-v tree got conflicts in: drivers/soc/Kconfig drivers/soc/Makefile between commit: 89d4f98ae90d ("ARM: remove zte zx platform") from the arm-soc tree and commit: 08734e0581a5 ("riscv: Use vendor name for K210 SoC support") from the risc-v 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 drivers/soc/Kconfig index f357c6c659d2,c0143651f4a9..000000000000 --- a/drivers/soc/Kconfig diff --cc drivers/soc/Makefile index 9bceb12b291d,fa7071246546..000000000000 --- a/drivers/soc/Makefile