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

diff --cc crypto/algif_aead.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/ethernet/lantiq_etop.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpmac.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
index 9522763c8faf4aea389a958f6248cc5f2b2847dc,c9140c3aeb67d5fc71b3911a8b2ddb51a2ef806a..c9414c0548526657e78f77eb792f14df278eb376
--- 1/drivers/net/hyperv/netvsc_drv.c
--- 2/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@@ -1393,14 -1404,8 +1397,15 @@@ static int netvsc_probe(struct hv_devic
        nvdev = net_device_ctx->nvdev;
        netif_set_real_num_tx_queues(net, nvdev->num_chn);
        netif_set_real_num_rx_queues(net, nvdev->num_chn);
+       netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
  
 +      /* MTU range: 68 - 1500 or 65521 */
 +      net->min_mtu = NETVSC_MTU_MIN;
 +      if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2)
 +              net->max_mtu = NETVSC_MTU - ETH_HLEN;
 +      else
 +              net->max_mtu = ETH_DATA_LEN;
 +
        ret = register_netdev(net);
        if (ret != 0) {
                pr_err("Unable to register netdev.\n");

diff --cc drivers/net/ipvlan/ipvlan_main.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
index 32fa7c76f29ca55a1202d4a1b68c98e017546cc1,c4ceb082e970e5d2a7d3b8c2c2f75813d52fbcff..0aadef9fc7dd700ad0dd72205c65865bfaa27912
--- 1/drivers/net/phy/phy_device.c
--- 2/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@@ -969,9 -926,9 +975,10 @@@ int phy_attach_direct(struct net_devic
        return err;
  
  error:
 +      phy_detach(phydev);
        put_device(d);
-       module_put(bus->owner);
+       if (ndev_owner != bus->owner)
+               module_put(bus->owner);
        return err;
  }
  EXPORT_SYMBOL(phy_attach_direct);

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc drivers/vhost/vsock.c
Simple merge

diff --cc kernel/events/core.c
Simple merge