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

Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/rk3288-evb.dtsi
Simple merge

diff --cc drivers/clk/rockchip/clk-rk3288.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/net/can/c_can/c_can.c
Simple merge

diff --cc drivers/net/can/dev.c
Simple merge

diff --cc drivers/net/can/m_can/m_can.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-dev.c
Simple merge

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

diff --cc drivers/net/ethernet/cisco/enic/enic_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/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/neterion/s2io.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.h
Simple merge

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

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

diff --cc drivers/s390/net/qeth_l2_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/netlink/af_netlink.h
Simple merge

diff --cc net/netlink/genetlink.c
Simple merge

diff --cc net/sched/cls_bpf.c
index 1029923f9e86815e5f1885cf83dd2e2c4d8e4db4,f59adf8a4cd780738187d5a50622f1ff9d50a20b..5f3ee9e4b5bf539e97f9195ceb904dc419634302
--- 1/net/sched/cls_bpf.c
--- 2/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@@ -179,7 -179,12 +179,12 @@@ static int cls_bpf_modify_existing(stru
                goto errout;
        }
  
 -      bpf_size = bpf_len * sizeof(*bpf_ops);
 +      bpf_size = bpf_num_ops * sizeof(*bpf_ops);
+       if (bpf_size != nla_len(tb[TCA_BPF_OPS])) {
+               ret = -EINVAL;
+               goto errout;
+       }
+ 
        bpf_ops = kzalloc(bpf_size, GFP_KERNEL);
        if (bpf_ops == NULL) {
                ret = -ENOMEM;

diff --cc net/socket.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/wireless/util.c
Simple merge