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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 999792d35ccc..bc5149d5ec38 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1910,7 +1910,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
         if (gdtc->dirty > gdtc->bg_thresh)
                 return true;
 
-        if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(gdtc))
+        if (wb_stat(wb, WB_RECLAIMABLE) >
+            wb_calc_thresh(gdtc->wb, gdtc->bg_thresh))
                 return true;
 
         if (mdtc) {
@@ -1924,7 +1925,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
                 if (mdtc->dirty > mdtc->bg_thresh)
                         return true;
 
-                if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(mdtc))
+                if (wb_stat(wb, WB_RECLAIMABLE) >
+                    wb_calc_thresh(mdtc->wb, mdtc->bg_thresh))
                         return true;
         }