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

Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/of.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/pcie.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/usb.c
Simple merge

diff --cc drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Simple merge

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

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

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

diff --cc net/ipx/af_ipx.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel_ht.c
Simple merge

diff --cc net/openvswitch/actions.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/openvswitch/flow_netlink.c
index c8fccdd,089b195..df3c7f2
--- 1/net/openvswitch/flow_netlink.c
--- 2/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@@ -768,10 -685,17 +768,17 @@@ static int ovs_key_from_nlattrs(struct 
  
                ipv6_key = nla_data(a[OVS_KEY_ATTR_IPV6]);
                if (!is_mask && ipv6_key->ipv6_frag > OVS_FRAG_TYPE_MAX) {
 -                      OVS_NLERR("Unknown IPv6 fragment type (value=%d, max=%d).\n",
 -                              ipv6_key->ipv6_frag, OVS_FRAG_TYPE_MAX);
 +                      OVS_NLERR(log, "IPv6 frag type %d is out of range max %d",
 +                                ipv6_key->ipv6_frag, OVS_FRAG_TYPE_MAX);
                        return -EINVAL;
                }
 -                      OVS_NLERR("IPv6 flow label %x is out of range (max=%x).\n",
+ 
+               if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) {
++                      OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n",
+                                 ntohl(ipv6_key->ipv6_label), (1 << 20) - 1);
+                       return -EINVAL;
+               }
+ 
                SW_FLOW_KEY_PUT(match, ipv6.label,
                                ipv6_key->ipv6_label, is_mask);
                SW_FLOW_KEY_PUT(match, ip.proto,