| Message ID | 20230822101615.046f0c32@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show
Return-Path: <linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=eYuYRY9Q; dkim-atps=neutral Authentication-Results: legolas.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+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RV8zG4PhKz1ydn for <incoming@patchwork.ozlabs.org>; Tue, 22 Aug 2023 10:16:42 +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=eYuYRY9Q; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4RV8zF6YTKz3brX for <incoming@patchwork.ozlabs.org>; Tue, 22 Aug 2023 10:16:41 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org 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=eYuYRY9Q; dkim-atps=neutral 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 4RV8yt3lY5z2ytJ for <linuxppc-dev@lists.ozlabs.org>; Tue, 22 Aug 2023 10:16:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692663378; bh=k2ZrAAORqZd1ybuBEXkZq8qLjVGqshyS/ofyxUhkJk8=; h=Date:From:To:Cc:Subject:From; b=eYuYRY9QKqPLF/nAstussaWknreBAk+B/WEpFUK5NEgqsKt0SXx1oTQStoHFDJWd0 06pY5vJ37BZb8t76hOvUzaBi8C/82HndW6Yih8BtmQX1YrGapxnRccCqVVXny6e0bc 6cNVIq6RI9vq5rFOWnDKFS3gp22FFKIwYmApvgJcfYV/gHgjl7ffWtP0qi1hx9iFZm 9vnlYBQ1nEowXAorfdr5vUTZhukyz3K6YGGSFpGaosFuDO58aeoPlCa+8yDR8DI1uF rX/7B1BTUn5Okqvbsc4KvP/WLmSxSteZdFF/Pm9E6NcpZI+CGp1x05ITOwZvDs8hhJ rthk/M5UR50FA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RV8yp3Zgmz4wb0; Tue, 22 Aug 2023 10:16:18 +1000 (AEST) Date: Tue, 22 Aug 2023 10:16:15 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Michael Ellerman <mpe@ellerman.id.au>, PowerPC <linuxppc-dev@lists.ozlabs.org>, Andrew Morton <akpm@linux-foundation.org> Subject: linux-next: manual merge of the powerpc tree with the mm-stable tree Message-ID: <20230822101615.046f0c32@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qXSVAU3nkCzwSZSkVMZ_B4y"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/> List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> Cc: Vaibhav Jain <vaibhav@linux.ibm.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Baoquan He <bhe@redhat.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> |
| Series |
linux-next: manual merge of the powerpc tree with the mm-stable tree
|
expand
|
diff --cc arch/powerpc/Kconfig index 21edd664689e,c831e20cf40f..000000000000 --- a/arch/powerpc/Kconfig
Hi all, Today's linux-next merge of the powerpc tree got a conflict in: arch/powerpc/Kconfig between commit: 8d05554dca2a ("powerpc: mm: convert to GENERIC_IOREMAP") from the mm-stable tree and commit: 0ceef6e99cc3 ("powerpc/idle: Add support for nohlt") 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.