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

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/device.c
index bda9492236378e36d248fc32e727a5271362b002,7db82b24302b63c576b8873565782987f6d33e0e..f25df5276c2214f6b0249eb0788413f0b6e2a212
--- 1/drivers/infiniband/hw/cxgb4/device.c
--- 2/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@@ -844,16 -696,7 +844,20 @@@ static int c4iw_rdev_open(struct c4iw_r
                pr_err(MOD "error allocating status page\n");
                goto err4;
        }
++
 +      if (c4iw_wr_log) {
 +              rdev->wr_log = kzalloc((1 << c4iw_wr_log_size_order) *
 +                                     sizeof(*rdev->wr_log), GFP_KERNEL);
 +              if (rdev->wr_log) {
 +                      rdev->wr_log_size = 1 << c4iw_wr_log_size_order;
 +                      atomic_set(&rdev->wr_log_idx, 0);
 +              } else {
 +                      pr_err(MOD "error allocating wr_log. Logging disabled\n");
 +              }
 +      }
++
+       rdev->status_page->db_off = 0;
++
        return 0;
  err4:
        c4iw_rqtpool_destroy(rdev);

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc drivers/net/wan/x25_asy.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc net/batman-adv/soft-interface.c
Simple merge

diff --cc net/core/dev.c
Simple merge