Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Jan 2015 00:59:56 +0000 (16:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Jan 2015 00:59:56 +0000 (16:59 -0800)
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>
42 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm/boot/dts/rk3288-evb.dtsi
drivers/clk/rockchip/clk-rk3288.c
drivers/infiniband/hw/mlx4/main.c
drivers/net/can/c_can/c_can.c
drivers/net/can/dev.c
drivers/net/can/m_can/m_can.c
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/cisco/enic/enic_main.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/neterion/s2io.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/renesas/sh_eth.h
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/usb/r8152.c
drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c
include/net/genetlink.h
include/net/ip.h
net/core/dev.c
net/ipv4/ip_sockglue.c
net/ipv4/route.c
net/ipv6/ip6_fib.c
net/ipv6/route.c
net/mac80211/mlme.c
net/mac80211/pm.c
net/mac80211/rx.c
net/netlink/af_netlink.c
net/netlink/af_netlink.h
net/netlink/genetlink.c
net/sched/cls_bpf.c
net/socket.c
net/wireless/nl80211.c
net/wireless/reg.c
net/wireless/util.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1029923f9e86815e5f1885cf83dd2e2c4d8e4db4,f59adf8a4cd780738187d5a50622f1ff9d50a20b..5f3ee9e4b5bf539e97f9195ceb904dc419634302
@@@ -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
Simple merge
Simple merge
Simple merge