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

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

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

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index da5e8e441e261601c0d9fcef83b8329d28f0ad88,12b0932204ba8ce425109714053d4bebbddc65b6..efdf8a261b9a4e4ade4fbb667efec8ea940f74a6
--- 1/drivers/net/ethernet/intel/i40e/i40e_main.c
--- 2/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -354,9 -354,9 +354,13 @@@ static struct rtnl_link_stats64 *i40e_g
        struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);
        int i;
  
++
 +      if (test_bit(__I40E_DOWN, &vsi->state))
 +              return stats;
 +
+       if (!vsi->tx_rings)
+               return stats;
+ 
        rcu_read_lock();
        for (i = 0; i < vsi->num_queue_pairs; i++) {
                struct i40e_ring *tx_ring, *rx_ring;

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

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

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

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc drivers/net/macvtap.c
index 431f58cb2ceb4399009702b3182195ce9a0f6cb2,2a89da0803177355ebae2f31ce92ceb2fae00599..a2c3a897206efd9444e37a792771323a594b953d
--- 1/drivers/net/macvtap.c
--- 2/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@@ -817,13 -819,12 +819,12 @@@ static ssize_t macvtap_put_user(struct 
        }
  
        ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
-       copied += len;
  
  done:
-       return ret ? ret : copied;
+       return ret ? ret : total;
  }
  
 -static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
 +static ssize_t macvtap_do_read(struct macvtap_queue *q,
                               const struct iovec *iv, unsigned long len,
                               int noblock)
  {
@@@ -874,8 -875,8 +875,8 @@@ static ssize_t macvtap_aio_read(struct 
                goto out;
        }
  
 -      ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
 +      ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK);
-       ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
+       ret = min_t(ssize_t, ret, len);
        if (ret > 0)
                iocb->ki_pos = ret;
  out:

diff --cc drivers/net/phy/micrel.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

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

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

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

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sctp/associola.c
index 3d7c6bd4631175b1d2fa09fb95efe6f055a5dbc0,31ed008c8e13e88b88935c5d83a503bdc089076e..5ae60920067470463420f0b3aa879e7c0999f200
--- 1/net/sctp/associola.c
--- 2/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@@ -144,9 -152,9 +144,8 @@@ static struct sctp_association *sctp_as
        asoc->timeouts[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]
                = 5 * asoc->rto_max;
  
 -      asoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0;
        asoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay;
-       asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] =
-               min_t(unsigned long, sp->autoclose, net->sctp.max_autoclose) * HZ;
+       asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = sp->autoclose * HZ;
  
        /* Initializes the timers */
        for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i)

diff --cc net/sctp/output.c
Simple merge

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/sctp/sysctl.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge