From nobody Thu Dec 18 14:27:30 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 9FEBCC4332F for ; Wed, 13 Dec 2023 01:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378225AbjLMBnB (ORCPT ); Tue, 12 Dec 2023 20:43:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378199AbjLMBnA (ORCPT ); Tue, 12 Dec 2023 20:43:00 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26DD1B7; Tue, 12 Dec 2023 17:43:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702431784; bh=kJaU2JTGNOSsbFtXofZUd1U0Nbf9C/FQpjhmSxjoQss=; h=Date:From:To:Cc:Subject:From; b=DxJM33ESLL/bxPYx7rOpgAAWenCpSfGRD1HDyTZfmRNQWNaNWkzqfoIC9oX3pi22U LMkU7ORwXNuKySICRXVCBrFek4KcKabFr2nu8haiEDXgnnt5X55+UqK4HFwmeJJ/8J qaSPP95bQ8f349gvhHYu3VMfFvscQ3bspNfLJ90uGNYHHgY3/RNcOiPR3He0PPQCqI DvgPaZQYrf7rpFVTMdiTry6OQ0Ei3p58ebV1430+QK3gB11apHcXXashANgZonKREx gvyr4aywZqi4sli36D3j7YOIJNp20QvtYM++vMGnUoXp98Xgdl93cilo6DDE38YFxq DCNy/c06yrYMA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SqdXl6PpPz4wdC; Wed, 13 Dec 2023 12:43:03 +1100 (AEDT) Date: Wed, 13 Dec 2023 12:43:02 +1100 From: Stephen Rothwell To: Joerg Roedel , Andrew Morton Cc: Heiko Carstens , Jason Gunthorpe , Jason Gunthorpe , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the iommu tree with the mm-nonmm-stable tree Message-ID: <20231213124302.2a6281af@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/fBm6b//CFPRkuNN2Ov+FvBG"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/fBm6b//CFPRkuNN2Ov+FvBG 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 iommu tree got a conflict in: arch/Kconfig between commits: 0eb5085c3874 ("arch: remove ARCH_TASK_STRUCT_ON_STACK") 3888750e21cc ("arch: remove ARCH_TASK_STRUCT_ALLOCATOR") from the mm-nonmm-stable tree and commit: 8f23f5dba6b4 ("iommu: Change kconfig around IOMMU_SVA") from the iommu 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/Kconfig index bfcc7c2dc039,3e49f862670e..000000000000 --- a/arch/Kconfig +++ b/arch/Kconfig @@@ -301,8 -301,22 +301,13 @@@ config ARCH_HAS_DMA_CLEAR_UNCACHE config ARCH_HAS_CPU_FINALIZE_INIT bool =20 + # The architecture has a per-task state that includes the mm's PASID + config ARCH_HAS_CPU_PASID + bool + select IOMMU_MM_DATA +=20 -# Select if arch init_task must go in the __init_task_data section -config ARCH_TASK_STRUCT_ON_STACK - bool - -# Select if arch has its private alloc_task_struct() function -config ARCH_TASK_STRUCT_ALLOCATOR - bool - config HAVE_ARCH_THREAD_STRUCT_WHITELIST bool - depends on !ARCH_TASK_STRUCT_ALLOCATOR help An architecture should select this to provide hardened usercopy knowledge about what region of the thread_struct should be --Sig_/fBm6b//CFPRkuNN2Ov+FvBG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV5DCYACgkQAVBC80lX 0Gww9Af/UGMcvjfqSRAZwOdSvyH21px/hWPgXvYKq6RIPdV8fG22tLyfQnVUrKUd r5LV6Pj+KL+UGu++xIAmBjVxQ4ySXmEWiqBGnh2qjOLa/6xjc74B2H5Eq/QmdDwl SDWyyZn1KRW0hAWmJ5MpVHlrSVtsvR9v12DlDlUegPbb1mZ2Qsc2PY8Fa5ahrB/k IJdCGYAGcDC9/l7tbTBUBzd5HVhesjlbeN3C9zTWBDzx6vkVFQr3iNDStwUC1AL6 4T9X92AEknMjPbQayo2Qckqs9oRiPqU9gTtDEcv2kjK8znE1WQZ5CUR/u/+u5Kg9 RkSIvP9+aPIw1nDoVVxJ4f14y3+Eew== =jFGo -----END PGP SIGNATURE----- --Sig_/fBm6b//CFPRkuNN2Ov+FvBG--