Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 0b72468e8131..57564318ceea 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -835,7 +835,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
         struct drm_device *dev = fb->dev;
         struct drm_atomic_state *state;
         struct drm_plane *plane;
-        struct drm_connector *conn;
+        struct drm_connector *conn __maybe_unused;
         struct drm_connector_state *conn_state;
         int i, ret;
         unsigned plane_mask;