From patchwork Thu Apr 15 09:44:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1466540 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org; receiver=) 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.a=rsa-sha256 header.s=201702 header.b=BsfLSY40; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 4FLZF838qZz9sVw for ; Thu, 15 Apr 2021 19:44:44 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4FLZF82QKSz3bSp for ; Thu, 15 Apr 2021 19:44:44 +1000 (AEST) Authentication-Results: lists.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.a=rsa-sha256 header.s=201702 header.b=BsfLSY40; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=canb.auug.org.au (client-ip=2401:3900:2:1::2; helo=ozlabs.org; envelope-from=sfr@canb.auug.org.au; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=BsfLSY40; dkim-atps=neutral Received: from ozlabs.org (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)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4FLZDn2h5nz2ym4 for ; Thu, 15 Apr 2021 19:44:23 +1000 (AEST) 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 4FLZDd64Wkz9sCD; Thu, 15 Apr 2021 19:44:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618479858; bh=RArAJTCC/ZsrvJupSUTPB3sBlqWIRoaht0fIS/nB95g=; h=Date:From:To:Cc:Subject:From; b=BsfLSY40emsL0vivTjnEkhsGnCJs8cEpyKuPyXAP8NMMGbnPBwdvNADn6YKVi14Le mN6JzuWvqbonYnHmFsWcc2oCZ5lmSie0bDW9ur8j9A6iDpuFZ1eUZAt0nToLPE8NMs P9nT827Znb8aFV/tNMQKOjaxH83mwbXPFmeyW3JmdPhr5IbvlMTV6fikKNig4n3z32 aGqCFbgnggMvtzBJSsbd+nwCXzoi6C+YJHXV987hszLdT1zVDQlIY2rtJGone+dejB 9swXIpTDtk4VsdB11GJCSNJK8cE89/huNhwFPDD74iV22E4pWcO1KgggjxvQBMxwEJ EZ8fjopNUu9QQ== Date: Thu, 15 Apr 2021 19:44:17 +1000 From: Stephen Rothwell To: Andrew Morton , Michael Ellerman , PowerPC Subject: linux-next: manual merge of the akpm-current tree with the powerpc tree Message-ID: <20210415194417.498e71b7@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: Stephen Rothwell , Linux Next Mailing List , Nicholas Piggin , Linux Kernel Mailing List Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/powerpc/kernel/module.c between commit: 2ec13df16704 ("powerpc/modules: Load modules closer to kernel text") from the powerpc tree and commit: 4930ba789f8d ("powerpc/64s/radix: enable huge vmalloc mappings") from the akpm-current tree. I fixed it up (I think - 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. Signed-off-by: Stephen Rothwell diff --cc arch/powerpc/kernel/module.c index fab84024650c,cdb2d88c54e7..000000000000 --- a/arch/powerpc/kernel/module.c