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

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

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

1 files changed, 0 insertions, 9 deletions

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 34f757bcabae..4594477dee00 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1666,9 +1666,6 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev,
 
                 funcs = plane->helper_private;
 
-                if (!drm_atomic_helper_framebuffer_changed(dev, state, plane_state->crtc))
-                        continue;
-
                 if (funcs->prepare_fb) {
                         ret = funcs->prepare_fb(plane, plane_state);
                         if (ret)
@@ -1685,9 +1682,6 @@ fail:
                 if (j >= i)
                         continue;
 
-                if (!drm_atomic_helper_framebuffer_changed(dev, state, plane_state->crtc))
-                        continue;
-
                 funcs = plane->helper_private;
 
                 if (funcs->cleanup_fb)
@@ -1954,9 +1948,6 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev,
         for_each_plane_in_state(old_state, plane, plane_state, i) {
                 const struct drm_plane_helper_funcs *funcs;
 
-                if (!drm_atomic_helper_framebuffer_changed(dev, old_state, plane_state->crtc))
-                        continue;
-
                 funcs = plane->helper_private;
 
                 if (funcs->cleanup_fb)