linux-next: manual merge of the drm-xe tree with the mm-hotfixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  include/linux/mmu_notifier.h

between commit:

  599b4e290c876 ("mm/mmu_notifier: clean up mmu_notifier.h kernel-doc")

from the mm-hotfixes tree and commit:

  7aba71dbc4164 ("mm/mmu_notifier: Allow two-pass struct mmu_interval_notifiers")

from the drm-xe 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 include/linux/mmu_notifier.h
index 3705d350c8633,b60673a8e0bbb..0000000000000
--- a/include/linux/mmu_notifier.h
+++ b/include/linux/mmu_notifier.h
@@@ -233,8 -233,33 +233,33 @@@ struct mmu_notifier 
  	unsigned int users;
  };
  
+ /**
+  * struct mmu_interval_notifier_finish - mmu_interval_notifier two-pass abstraction
+  * @link: Lockless list link for the notifiers pending pass list
+  * @notifier: The mmu_interval_notifier for which the finish pass is called.
+  *
+  * Allocate, typically using GFP_NOWAIT in the interval notifier's start pass.
+  * Note that with a large number of notifiers implementing two passes,
+  * allocation with GFP_NOWAIT will become increasingly likely to fail, so consider
+  * implementing a small pool instead of using kmalloc() allocations.
+  *
+  * If the implementation needs to pass data between the start and the finish passes,
+  * the recommended way is to embed struct mmu_interval_notifier_finish into a larger
+  * structure that also contains the data needed to be shared. Keep in mind that
+  * a notifier callback can be invoked in parallel, and each invocation needs its
+  * own struct mmu_interval_notifier_finish.
+  *
+  * If allocation fails, then the &mmu_interval_notifier_ops->invalidate_start op
+  * needs to implements the full notifier functionality. Please refer to its
+  * documentation.
+  */
+ struct mmu_interval_notifier_finish {
+ 	struct llist_node link;
+ 	struct mmu_interval_notifier *notifier;
+ };
+ 
  /**
 - * struct mmu_interval_notifier_ops
 + * struct mmu_interval_notifier_ops - callback for range notification
   * @invalidate: Upon return the caller must stop using any SPTEs within this
   *              range. This function can sleep. Return false only if sleeping
   *              was required but mmu_notifier_range_blockable(range) is false.

Attachment: signature.asc
Description: PGP signature