diff options
author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /include/net/xdp_sock.h | |
parent | cd9063757a227cf31ebf5391ccda2bf583b0806e (diff) | |
parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'include/net/xdp_sock.h')
-rw-r--r-- | include/net/xdp_sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 61cf7dbb6782..d074b6d60f8a 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -36,7 +36,6 @@ struct xdp_umem { u32 headroom; u32 chunk_size_nohr; struct user_struct *user; - struct pid *pid; unsigned long address; refcount_t users; struct work_struct work; |