From mboxrd@z Thu Jan 1 00:00:00 1970 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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 3EED3C3A59B for ; Mon, 2 Sep 2019 09:08:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13969217D7 for ; Mon, 2 Sep 2019 09:08:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729805AbfIBJIu (ORCPT ); Mon, 2 Sep 2019 05:08:50 -0400 Received: from foss.arm.com ([217.140.110.172]:50774 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729804AbfIBJIu (ORCPT ); Mon, 2 Sep 2019 05:08:50 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ED91028; Mon, 2 Sep 2019 02:08:49 -0700 (PDT) Received: from arrakis.emea.arm.com (arrakis.cambridge.arm.com [10.1.196.78]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CD7C33F246; Mon, 2 Sep 2019 02:08:48 -0700 (PDT) Date: Mon, 2 Sep 2019 10:08:46 +0100 From: Catalin Marinas To: Michael Ellerman Cc: Stephen Rothwell , PowerPC , Will Deacon , Linux Next Mailing List , Linux Kernel Mailing List , Thiago Jung Bauermann , Peter Collingbourne Subject: Re: linux-next: manual merge of the powerpc tree with the arm64 tree Message-ID: <20190902090846.GA15118@arrakis.emea.arm.com> References: <20190902094711.2625ba31@canb.auug.org.au> <87lfv7tqt0.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87lfv7tqt0.fsf@mpe.ellerman.id.au> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Sep 02, 2019 at 11:44:43AM +1000, Michael Ellerman wrote: > Stephen Rothwell writes: > > Hi all, > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > arch/Kconfig > > > > between commit: > > > > 5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR relocations") > > > > from the arm64 tree and commit: > > > > 0c9c1d563975 ("x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to arch/Kconfig") > > > > from the powerpc 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. > > Thanks. > > That conflict seems entirely trivial, but Catalin/Will if it bothers you > I have the conflicting commit in a topic branch based on rc2 which you > could merge to resolve it: It's a trivial conflict, easy to resolve. I don't think it's worth trying to avoid it (Linus normally doesn't mind such conflicts). -- Catalin