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

Pull networking updates from David Miller:

 1) BPF debugger and asm tool by Daniel Borkmann.

 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.

 3) Correct reciprocal_divide and update users, from Hannes Frederic
    Sowa and Daniel Borkmann.

 4) Currently we only have a "set" operation for the hw timestamp socket
    ioctl, add a "get" operation to match.  From Ben Hutchings.

 5) Add better trace events for debugging driver datapath problems, also
    from Ben Hutchings.

 6) Implement auto corking in TCP, from Eric Dumazet.  Basically, if we
    have a small send and a previous packet is already in the qdisc or
    device queue, defer until TX completion or we get more data.

 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.

 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
    Borkmann.

 9) Share IP header compression code between Bluetooth and IEEE802154
    layers, from Jukka Rissanen.

10) Fix ipv6 router reachability probing, from Jiri Benc.

11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.

12) Support tunneling in GRO layer, from Jerry Chu.

13) Allow bonding to be configured fully using netlink, from Scott
    Feldman.

14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
    already get the TCI.  From Atzm Watanabe.

15) New "Heavy Hitter" qdisc, from Terry Lam.

16) Significantly improve the IPSEC support in pktgen, from Fan Du.

17) Allow ipv4 tunnels to cache routes, just like sockets.  From Tom
    Herbert.

18) Add Proportional Integral Enhanced packet scheduler, from Vijay
    Subramanian.

19) Allow openvswitch to mmap'd netlink, from Thomas Graf.

20) Key TCP metrics blobs also by source address, not just destination
    address.  From Christoph Paasch.

21) Support 10G in generic phylib.  From Andy Fleming.

22) Try to short-circuit GRO flow compares using device provided RX
    hash, if provided.  From Tom Herbert.

The wireless and netfilter folks have been busy little bees too.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
  net/cxgb4: Fix referencing freed adapter
  ipv6: reallocate addrconf router for ipv6 address when lo device up
  fib_frontend: fix possible NULL pointer dereference
  rtnetlink: remove IFLA_BOND_SLAVE definition
  rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
  qlcnic: update version to 5.3.55
  qlcnic: Enhance logic to calculate msix vectors.
  qlcnic: Refactor interrupt coalescing code for all adapters.
  qlcnic: Update poll controller code path
  qlcnic: Interrupt code cleanup
  qlcnic: Enhance Tx timeout debugging.
  qlcnic: Use bool for rx_mac_learn.
  bonding: fix u64 division
  rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
  sfc: Use the correct maximum TX DMA ring size for SFC9100
  Add Shradha Shah as the sfc driver maintainer.
  net/vxlan: Share RX skb de-marking and checksum checks with ovs
  tulip: cleanup by using ARRAY_SIZE()
  ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
  net/cxgb4: Don't retrieve stats during recovery
  ...

diff --cc Documentation/devicetree/bindings/net/phy.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arc/include/asm/Kbuild
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc arch/cris/include/asm/Kbuild
index 199b1a9dab8922b307cca53b1d2dbf3ccf83faee,406cbd3ebd5849cb485861b8f5488ab1550686ee..f3fd8768f095cc55c606d22bf5281042a31234c2
--- 1/arch/cris/include/asm/Kbuild
--- 2/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -3,9 -3,9 +3,10 @@@ header-y += arch-v10
  header-y += arch-v32/
  
  
 +generic-y += barrier.h
  generic-y += clkdev.h
  generic-y += exec.h
+ generic-y += hash.h
  generic-y += kvm_para.h
  generic-y += linkage.h
  generic-y += module.h

diff --cc arch/hexagon/include/asm/Kbuild
Simple merge

diff --cc arch/microblaze/include/asm/Kbuild
index a82426589fffb2cb9bf440b1d44ad73eab8002f9,ca60945ddf307cddaef5989df64258db8638362d..2b98bc73642afb4cd07c7c412c416c9a87cb69de
--- 1/arch/microblaze/include/asm/Kbuild
--- 2/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,7 -1,7 +1,8 @@@
  
 +generic-y += barrier.h
  generic-y += clkdev.h
  generic-y += exec.h
+ generic-y += hash.h
  generic-y += trace_clock.h
  generic-y += syscalls.h
  generic-y += preempt.h

diff --cc arch/mn10300/include/asm/Kbuild
index 032143ec23245113fd0394c8a5d26dfc134ea29e,199345207d8292f56118c8bc39b74584ad4a1dde..992e989ab7853d3f3e1be4bbb432cf4c2de8c7a2
--- 1/arch/mn10300/include/asm/Kbuild
--- 2/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@@ -1,6 -1,6 +1,7 @@@
  
 +generic-y += barrier.h
  generic-y += clkdev.h
  generic-y += exec.h
+ generic-y += hash.h
  generic-y += trace_clock.h
  generic-y += preempt.h

diff --cc arch/parisc/include/asm/Kbuild
Simple merge

diff --cc arch/score/include/asm/Kbuild
index fe7471eb0167cb92e313d86169f0b77e964845df,1d35e33ccf8688364a5be12c4b6aac734c50e942..146b9d5e89f83ba0b41506aa369254d5869dbe88
--- 1/arch/score/include/asm/Kbuild
--- 2/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@@ -1,8 -1,8 +1,9 @@@
  
  header-y +=
  
 +generic-y += barrier.h
  generic-y += clkdev.h
+ generic-y += hash.h
  generic-y += trace_clock.h
  generic-y += xor.h
  generic-y += preempt.h

diff --cc arch/xtensa/include/asm/Kbuild
Simple merge

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/8390/hydra.c
Simple merge

diff --cc drivers/net/ethernet/8390/zorro8390.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/fw.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mcg.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/port.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc drivers/net/ethernet/natsemi/macsonic.c
Simple merge

diff --cc drivers/net/wan/lmc/lmc_main.c
Simple merge

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

diff --cc drivers/phy/Kconfig
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/staging/ozwpan/ozproto.c
Simple merge

diff --cc fs/dlm/lowcomms.c
Simple merge

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

diff --cc include/linux/mlx4/cmd.h
Simple merge

diff --cc include/linux/mlx4/cq.h
index e1862997f933ce7cc1c5d46d817e6f587d25222d,5dd0d70a06895b49e1d83db28968d0ebfdb179e0..e7ecc12a11636f1afe2f591e019da293ed1f517a
--- 1/include/linux/mlx4/cq.h
--- 2/include/linux/mlx4/cq.h
+++ b/include/linux/mlx4/cq.h
@@@ -87,9 -81,13 +87,14 @@@ struct mlx4_ts_cqe 
  } __packed;
  
  enum {
+       MLX4_CQE_L2_TUNNEL_IPOK         = 1 << 31,
        MLX4_CQE_VLAN_PRESENT_MASK      = 1 << 29,
+       MLX4_CQE_L2_TUNNEL              = 1 << 27,
+       MLX4_CQE_L2_TUNNEL_CSUM         = 1 << 26,
+       MLX4_CQE_L2_TUNNEL_IPV4         = 1 << 25,
+ 
        MLX4_CQE_QPN_MASK               = 0xffffff,
 +      MLX4_CQE_VID_MASK               = 0xfff,
  };
  
  enum {

diff --cc include/linux/mlx4/device.h
index ac5cb1d92487c4dc5b1512999a719bd34ab927f7,c99ecf6d2c675f53dc127058638ea5f9d501cb8d..5edd2c68274dd449f34f557296ce789e38578dad
--- 1/include/linux/mlx4/device.h
--- 2/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@@ -161,7 -166,7 +166,8 @@@ enum 
        MLX4_DEV_CAP_FLAG2_VLAN_CONTROL         = 1LL <<  6,
        MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7,
        MLX4_DEV_CAP_FLAG2_UPDATE_QP            = 1LL <<  8,
-       MLX4_DEV_CAP_FLAG2_DMFS_IPOIB           = 1LL <<  9
 -      MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS       = 1LL <<  9
++      MLX4_DEV_CAP_FLAG2_DMFS_IPOIB           = 1LL <<  9,
++      MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS       = 1LL <<  10,
  };
  
  enum {
@@@ -1096,7 -1130,7 +1131,8 @@@ int mlx4_SET_PORT_qpn_calc(struct mlx4_
  int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
  int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
                u8 *pg, u16 *ratelimit);
+ int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering);
 +int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
  int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
  int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
  void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan);

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

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

diff --cc include/net/netlabel.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc include/uapi/linux/pci_regs.h
Simple merge

diff --cc lib/Makefile
Simple merge

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

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

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

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/nfc/digital_dep.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge