Merge tag 'v4.0-rc6' into drm-intel-next

Backmerge Linux 4.0-rc6 because conflicts are (again) getting out of
hand. To make sure we don't lose any bugfixes from the 4.0-rc5-rc6
flurry of patches we've applied them all to -next too.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Always take the version from -next, we've already handled all
conflicts with explicit cherrypicking.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 072426a72745..cd7675ac5bf9 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1136,6 +1136,8 @@ restart_poll:
         ibmveth_replenish_task(adapter);
 
         if (frames_processed < budget) {
+                napi_complete(napi);
+
                 /* We think we are done - reenable interrupts,
                  * then check once more to make sure we are done.
                  */
@@ -1144,8 +1146,6 @@ restart_poll:
 
                 BUG_ON(lpar_rc != H_SUCCESS);
 
-                napi_complete(napi);
-
                 if (ibmveth_rxq_pending_buffer(adapter) &&
                     napi_reschedule(napi)) {
                         lpar_rc = h_vio_signal(adapter->vdev->unit_address,