diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-02-25 17:36:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-02-25 17:36:09 +1000 |
| commit | fb51bf02551958265b7116f6ba92752295c83c26 (patch) | |
| tree | 7642e57ef59c30cf1423196ba071074b931f1d94 /drivers/accel | |
| parent | 7b91683e7de7ddec6b256574308ba77277aeb2e2 (diff) | |
| parent | d082ecbc71e9e0bf49883ee4afd435a77a5101b6 (diff) | |
Merge tag 'v6.14-rc4' into drm-next
Backmerge Linux 6.14-rc4 at the request of tzimmermann so misc-next
can base on rc4.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/accel')
| -rw-r--r-- | drivers/accel/amdxdna/amdxdna_mailbox.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/accel/amdxdna/amdxdna_mailbox.c b/drivers/accel/amdxdna/amdxdna_mailbox.c index de7bf0fb4594..aa07e67400ef 100644 --- a/drivers/accel/amdxdna/amdxdna_mailbox.c +++ b/drivers/accel/amdxdna/amdxdna_mailbox.c @@ -8,6 +8,7 @@ #include <linux/bitfield.h> #include <linux/interrupt.h> #include <linux/iopoll.h> +#include <linux/slab.h> #include <linux/xarray.h> #define CREATE_TRACE_POINTS |