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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 E68FFC3A59E for ; Mon, 2 Sep 2019 10:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD26321882 for ; Mon, 2 Sep 2019 10:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567418738; bh=iQNOaVNIibG/E83RsQu3zxq0uZKqXIRDYCf4g6iBZyI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=wn7Z+/qSa5Y4yblWu5GJOxQUInDH1ZIXFt+9ZTGfvcflcM1gYqNPaE9BB2RPMGtNK xpDtA1tl+1qBv2/ZbHn7qIdjszyKf7hlzUBFmHjw/tOMDE+STEd1RApMnS7rNiRAdd /sY/M9HuefKwc0huCf6xp91Bwxkp2yd5wPuMWfgc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729999AbfIBKFi (ORCPT ); Mon, 2 Sep 2019 06:05:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:45320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729560AbfIBKFi (ORCPT ); Mon, 2 Sep 2019 06:05:38 -0400 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A03E2217D7; Mon, 2 Sep 2019 10:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567418737; bh=iQNOaVNIibG/E83RsQu3zxq0uZKqXIRDYCf4g6iBZyI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=g8wXqV6M5/b7tJLpLO0LrEhkHhwlyEquHOPeA+/io757PMkko1gtYUssOXg4jAA0/ UbiaoH21sH6/l23tq67ad74j98GVtopkkKLTlVPPUkFh99VWz8Mr+LGdjETDGcMSFK hPvz+YDNRxP8GrEmsu+JhtwTSGQcnIrLjlI4mbdc= Date: Mon, 2 Sep 2019 11:05:32 +0100 From: Will Deacon To: Catalin Marinas Cc: Michael Ellerman , Stephen Rothwell , PowerPC , 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: <20190902100531.45bwfll4fmjrkmhp@willie-the-truck> References: <20190902094711.2625ba31@canb.auug.org.au> <87lfv7tqt0.fsf@mpe.ellerman.id.au> <20190902090846.GA15118@arrakis.emea.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190902090846.GA15118@arrakis.emea.arm.com> User-Agent: NeoMutt/20170113 (1.7.2) 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 10:08:46AM +0100, Catalin Marinas wrote: > 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). Agreed, we can live with this one :) Will