Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 03 Jul 2018 09:28:27 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992916AbeGCH233o8XZ/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jul 3 09:26:14 2018 +0200 Commit: a5739b996e14ab528cbe9f0c1be12e60cf7ca315 Gitweb: https://git.linux-mips.org/g/ralf/linux/a5739b996e14 Branch: master --- Makefile | 5 arch/arm/net/bpf_jit_32.c | 2 arch/openrisc/include/asm/pgalloc.h | 6 arch/openrisc/kernel/entry.S | 8 - arch/openrisc/kernel/head.S | 9 - arch/openrisc/kernel/traps.c | 2 arch/s390/net/bpf_jit_comp.c | 1 drivers/atm/iphase.c | 2 drivers/atm/zatm.c | 2 drivers/infiniband/hw/mlx5/main.c | 2 drivers/md/md.c | 8 - drivers/md/raid10.c | 7 + drivers/media/rc/bpf-lirc.c | 14 - drivers/net/ethernet/atheros/alx/main.c | 8 + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 drivers/net/ethernet/broadcom/cnic.c | 2 drivers/net/ethernet/cadence/macb_main.c | 2 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 15 + drivers/net/ethernet/freescale/fman/fman_port.c | 8 + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 1 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 24 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 - drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 - drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 12 - .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 3 drivers/net/ethernet/mellanox/mlx5/core/fw.c | 5 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 9 - drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 - drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 drivers/net/ethernet/netronome/nfp/bpf/main.c | 9 - drivers/net/ethernet/netronome/nfp/flower/match.c | 14 + .../net/ethernet/netronome/nfp/flower/offload.c | 11 + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 8 - drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 8 + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 19 + drivers/net/ethernet/qlogic/qede/qede_ptp.c | 10 + drivers/net/ethernet/sfc/farch.c | 1 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 2 drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 drivers/net/geneve.c | 2 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc.c | 37 +++ drivers/net/hyperv/netvsc_drv.c | 17 + drivers/net/hyperv/rndis_filter.c | 61 +---- drivers/net/ipvlan/ipvlan_main.c | 36 ++- drivers/net/phy/dp83tc811.c | 2 drivers/net/usb/lan78xx.c | 37 +++ drivers/net/usb/r8152.c | 3 drivers/net/virtio_net.c | 30 +- drivers/net/vxlan.c | 4 drivers/s390/net/qeth_core.h | 13 + drivers/s390/net/qeth_core_main.c | 47 ++-- drivers/s390/net/qeth_l2_main.c | 24 +- drivers/s390/net/qeth_l3_main.c | 3 include/linux/bpf-cgroup.h | 26 ++ include/linux/bpf.h | 8 + include/linux/bpf_lirc.h | 5 include/linux/filter.h | 56 +--- include/linux/mlx5/eswitch.h | 2 include/linux/mlx5/mlx5_ifc.h | 2 include/linux/netdevice.h | 20 ++ include/net/net_namespace.h | 1 include/net/netns/ipv6.h | 1 include/net/pkt_cls.h | 5 include/uapi/linux/bpf.h | 28 ++ kernel/bpf/cgroup.c | 54 ++++ kernel/bpf/core.c | 30 -- kernel/bpf/sockmap.c | 254 ++++++++++++++------ kernel/bpf/syscall.c | 99 ++------ lib/test_bpf.c | 20 ++ net/8021q/vlan.c | 2 net/Makefile | 4 net/bpfilter/Kconfig | 2 net/bpfilter/Makefile | 17 - net/bpfilter/bpfilter_kern.c | 11 - net/bpfilter/bpfilter_umh_blob.S | 7 + net/core/dev_ioctl.c | 11 - net/core/fib_rules.c | 80 ++++++ net/core/filter.c | 86 ++++--- net/core/skbuff.c | 3 net/core/sock.c | 7 - net/ipv4/fou.c | 4 net/ipv4/gre_offload.c | 2 net/ipv4/sysctl_net_ipv4.c | 18 + net/ipv4/tcp_input.c | 13 + net/ipv4/udp_offload.c | 2 net/ipv6/addrconf.c | 9 - net/ipv6/netfilter/nf_conntrack_reasm.c | 6 net/ipv6/seg6_hmac.c | 2 net/mac80211/tx.c | 2 net/netfilter/nf_conncount.c | 52 ++++ net/netfilter/nf_conntrack_helper.c | 5 net/netfilter/nf_log.c | 13 + net/netfilter/nfnetlink_queue.c | 3 net/rds/connection.c | 11 + net/rds/loop.c | 56 ++++ net/rds/loop.h | 2 net/smc/af_smc.c | 96 +++++--- net/smc/smc.h | 8 + net/strparser/strparser.c | 17 - net/wireless/nl80211.c | 35 +-- samples/bpf/xdp_fwd_kern.c | 8 - scripts/cc-can-link.sh | 2 tools/bpf/bpftool/prog.c | 12 + tools/testing/selftests/bpf/config | 1 tools/testing/selftests/bpf/test_kmod.sh | 9 + tools/testing/selftests/bpf/test_lirc_mode2.sh | 9 + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 9 + tools/testing/selftests/bpf/test_sockmap.c | 6 tools/testing/selftests/net/fib_tests.sh | 0 120 files changed, 1274 insertions(+), 639 deletions(-)