Merge drm/drm-next into drm-intel-gt-next

We need
4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and we are stuck at 6.9 so lets bump things forward.

Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

1 files changed, 37 insertions, 0 deletions

diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
new file mode 100644
index 000000000000..0640b7e115be
--- /dev/null
+++ b/rust/helpers/helpers.c
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Non-trivial C macros cannot be used in Rust. Similarly, inlined C functions
+ * cannot be called either. This file explicitly creates functions ("helpers")
+ * that wrap those so that they can be called from Rust.
+ *
+ * Sorted alphabetically.
+ */
+
+#include "blk.c"
+#include "bug.c"
+#include "build_assert.c"
+#include "build_bug.c"
+#include "cred.c"
+#include "device.c"
+#include "err.c"
+#include "fs.c"
+#include "io.c"
+#include "jump_label.c"
+#include "kunit.c"
+#include "mutex.c"
+#include "page.c"
+#include "platform.c"
+#include "pci.c"
+#include "pid_namespace.c"
+#include "rbtree.c"
+#include "rcu.c"
+#include "refcount.c"
+#include "security.c"
+#include "signal.c"
+#include "slab.c"
+#include "spinlock.c"
+#include "task.c"
+#include "uaccess.c"
+#include "vmalloc.c"
+#include "wait.c"
+#include "workqueue.c"