diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2025-05-28 10:20:17 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2025-05-28 10:20:17 +0300 |
| commit | bbfd5594756011167b8f8de9a00e0c946afda1e6 (patch) | |
| tree | 11171eb57fdb6b5123d796805cd0df10f6fc877b /net/unix/unix_bpf.c | |
| parent | d2dc30e0aa252830f908c8e793d3139d51321370 (diff) | |
| parent | f8bb3ed3197966fb60bedcbdc126d2bd5bc0a77f (diff) | |
| download | linux-bbfd5594756011167b8f8de9a00e0c946afda1e6.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
Need to pull in a67221b5eb8d ("drm/i915/dp: Return min bpc supported by source instead of 0")
in order to fix build breakage on GCC 9.4.0 (from Ubuntu 20.04).
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'net/unix/unix_bpf.c')
| -rw-r--r-- | net/unix/unix_bpf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/unix/unix_bpf.c b/net/unix/unix_bpf.c index bca2d86ba97d..e0d30d6d22ac 100644 --- a/net/unix/unix_bpf.c +++ b/net/unix/unix_bpf.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2021 Cong Wang <cong.wang@bytedance.com> */ -#include <linux/skmsg.h> #include <linux/bpf.h> -#include <net/sock.h> +#include <linux/skmsg.h> #include <net/af_unix.h> +#include "af_unix.h" + #define unix_sk_has_data(__sk, __psock) \ ({ !skb_queue_empty(&__sk->sk_receive_queue) || \ !skb_queue_empty(&__psock->ingress_skb) || \ |