From patchwork Sun Sep 1 23:47:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1156393 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46M90X1rDLz9sPJ for ; Mon, 2 Sep 2019 09:49:00 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="IM/wa5hj"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46M90W4hk6zDqZH for ; Mon, 2 Sep 2019 09:48:59 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46M8yT67YBzDqXL for ; Mon, 2 Sep 2019 09:47:13 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="IM/wa5hj"; dkim-atps=neutral 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 46M8yS24Spz9sPJ; Mon, 2 Sep 2019 09:47:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1567381633; bh=zmc88K7pPwz/7pK597nkwLmMZfxgBX1IUukfW1MCsGc=; h=Date:From:To:Cc:Subject:From; b=IM/wa5hjdoxSeultbW2f/JTStiYCBqgVgQDblV7OcN1wn6K6FC/xUcMWC030P4qI0 IkIwFfDb/KY15sOBmXm4CJHxTkdFwuOttbKcmlH9g5HpVdJ+ckYpBMM/fp1G1zajEd EFzv79SjhbiWVlazsNavTE9SXaUt91xHcanC6ezJvDi9V+jpJ4uuFbvmJ/OLXvRhd8 0e87EpCAGQsyznCYVcS6x6EC0xnD7l0e73KuqJFT5r8YEcY6UBWCjxLZxHzAzulLWQ WGEb4DL8rfgfpKkjzIJ/jBL+VCua7kBNDfkODWTCoig/02grtoaYD51IYB052AcoaL v427yot0yTuwQ== Date: Mon, 2 Sep 2019 09:47:11 +1000 From: Stephen Rothwell To: Michael Ellerman , PowerPC , Catalin Marinas , Will Deacon Subject: linux-next: manual merge of the powerpc tree with the arm64 tree Message-ID: <20190902094711.2625ba31@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Peter Collingbourne , Linux Kernel Mailing List , Thiago Jung Bauermann Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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. diff --cc arch/Kconfig index 6f4d3e9bf486,89e2e3f64f79..000000000000 --- a/arch/Kconfig