diff options
| author |   Tvrtko Ursulin <tursulin@ursulin.net> | 2025-02-05 09:29:14 +0000 |
|---|---|---|
| committer | Tvrtko Ursulin <tursulin@ursulin.net> | 2025-02-05 09:29:14 +0000 |
| commit | c771600c6af14749609b49565ffb4cac2959710d (patch) | |
| tree | e9be426f1b32598527127fd0fa1b265a7cc83044 /lib/interval_tree_test.c | |
| parent | drm/i915/slpc: Add sysfs for SLPC power profiles (diff) | |
| parent | Linux 6.14-rc1 (diff) | |
| download | wireguard-linux-c771600c6af14749609b49565ffb4cac2959710d.tar.xz wireguard-linux-c771600c6af14749609b49565ffb4cac2959710d.zip | |
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>
Diffstat (limited to 'lib/interval_tree_test.c')
| -rw-r--r-- | lib/interval_tree_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/interval_tree_test.c b/lib/interval_tree_test.c index f37f4d44faa9..837064b83a6c 100644 --- a/lib/interval_tree_test.c +++ b/lib/interval_tree_test.c @@ -2,7 +2,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/interval_tree.h> -#include <linux/random.h> +#include <linux/prandom.h> #include <linux/slab.h> #include <asm/timex.h> |