From nobody Wed Dec 17 10:56:24 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F24B0EE49A6 for ; Tue, 22 Aug 2023 00:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231929AbjHVAQg (ORCPT ); Mon, 21 Aug 2023 20:16:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231918AbjHVAQ3 (ORCPT ); Mon, 21 Aug 2023 20:16:29 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09C091A8; Mon, 21 Aug 2023 17:16:20 -0700 (PDT) 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 To: Michael Ellerman , PowerPC , Andrew Morton Cc: Baoquan He , Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List , Vaibhav Jain 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/qXSVAU3nkCzwSZSkVMZ_B4y Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. --=20 Cheers, Stephen Rothwell diff --cc arch/powerpc/Kconfig index 21edd664689e,c831e20cf40f..000000000000 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -195,7 -194,7 +196,8 @@@ config PP select GENERIC_CPU_VULNERABILITIES if PPC_BARRIER_NOSPEC select GENERIC_EARLY_IOREMAP select GENERIC_GETTIMEOFDAY + select GENERIC_IDLE_POLL_SETUP + select GENERIC_IOREMAP select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL select GENERIC_PCI_IOMAP if PCI --Sig_/qXSVAU3nkCzwSZSkVMZ_B4y Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTj/k8ACgkQAVBC80lX 0GxCMAgAlFzgy+Rn2m3nNB1KybK8ks+xuSJdcicuO00rmVqXUhb9zRM9uLuF9HK8 yNvBMZ6D23sDyBuW+NN51BhHxU5PMx2uAqNpt0TStImpGdPcL/rrQ66wZcaxNijH pxy0MAGxpm985rw7Ua8esMUon09AHrne98AJh9fMQ3lk20/eGIbal9P4VwClay+W MohrkVd2LaHyOPI6FjnK7GHlmYilVncq3zt0L3kuEwWNJR0UB34ZA7kRBPC1qj3q j9n94Vz5/u9h6lju4T7pnfw59QE8gFt2n5rTjP3T197oXNBy0nzrSZ7r7MpQeQJP eWEFpn4punhaXMq4BWZY+0nQA2f/iA== =T/9b -----END PGP SIGNATURE----- --Sig_/qXSVAU3nkCzwSZSkVMZ_B4y--