linux-next: manual merge of the iommu tree with the mm-nonmm-stable tree

linux-next: manual merge of the iommu tree with the mm-nonmm-stable tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]

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.

-- 
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
  
+ # The architecture has a per-task state that includes the mm's PASID
+ config ARCH_HAS_CPU_PASID
+ 	bool
+ 	select IOMMU_MM_DATA
+ 
 -# 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]