From patchwork Fri May 20 05:40:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1633688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=pkRBMsur; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4L4Fvd1dnSz9sG0 for ; Fri, 20 May 2022 15:41:17 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4L4Fvd0dHSz3bm4 for ; Fri, 20 May 2022 15:41:17 +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=pkRBMsur; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (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 4L4FvJ1dDqz3bhf for ; Fri, 20 May 2022 15:41:00 +1000 (AEST) 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=pkRBMsur; 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 4L4FvD4Mklz4xD3; Fri, 20 May 2022 15:40:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653025257; bh=UONhc8eOK/71SNVc91VCVNl1YuVFpgEjRpX1+7pNizk=; h=Date:From:To:Cc:Subject:From; b=pkRBMsur2B3BhsBaN/fhKRM0jls04iK8jbzxf5ky4TlnmVl8ySkWieIodaQIuNLeK 9Di2bppIXcMNTZenLp0MCJGYTeBbLPmGBLvzC+B36hu6jwJcjICINk9vd37gM7P3LS UduvBuMm+Bm7i/7ilYM2qoN+5vo8Axr17pe+B8DsD+RKuGVaGfDXP/3bw/AlxJAhBT 98spG6oQreMQndjr2+WeyBVBFnwVUjKtXVcgQ+IctYWSfo9Fw7Y238EAWb2vO3s5Ys vnXejexnSNdmsl8L/6K9ZnVcZCqJo6f8J2lqZCXbJizQ+osn0Pp64dwPF2eCvSbCqi aTkOVArxreMiw== Date: Fri, 20 May 2022 15:40:55 +1000 From: Stephen Rothwell To: Luis Chamberlain , Michael Ellerman Subject: linux-next: manual merge of the modules tree with the powerpc tree Message-ID: <20220520154055.7f964b76@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 Kernel Mailing List , Linux Next Mailing List , PowerPC , Daniel Axtens Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the modules tree got a conflict in: arch/powerpc/Kconfig between commit: b91d4eea5bff ("powerpc: Book3S 64-bit outline-only KASAN support") from the powerpc tree and commit: eeaec7801c42 ("powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx") from the modules 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/powerpc/Kconfig index dddace39d005,0b7bcfa63d0d..000000000000 --- a/arch/powerpc/Kconfig