Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Thu, 21 Jun 2018 07:50:16 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992494AbeFUFuTIlGWv/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Jun 21 07:45:09 2018 +0200 Commit: ceaecc5a2b77b45c1f302a78fdfd0291e6bf6d56 Gitweb: https://git.linux-mips.org/g/ralf/linux/ceaecc5a2b77 Branch: master --- MAINTAINERS | 5 + drivers/bluetooth/hci_nokia.c | 2 - drivers/infiniband/core/uverbs_main.c | 14 +++- drivers/infiniband/core/verbs.c | 14 ++-- drivers/infiniband/hw/mlx4/mr.c | 7 +- drivers/infiniband/hw/mlx5/main.c | 36 +++++---- drivers/infiniband/hw/qedr/verbs.c | 3 + drivers/infiniband/sw/rxe/rxe_req.c | 5 + drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 - drivers/net/ethernet/cisco/enic/enic_main.c | 12 ++- drivers/net/ethernet/faraday/ftgmac100.c | 4 + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 +-- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 ++- drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +++ drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 - .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 ++++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +++ drivers/net/ethernet/sun/sungem.c | 22 +++--- drivers/net/ethernet/ti/davinci_emac.c | 15 +++- drivers/net/hamradio/bpqether.c | 8 +- drivers/net/ipvlan/ipvlan_main.c | 1 drivers/net/net_failover.c | 2 - drivers/net/usb/cdc_ncm.c | 3 - drivers/ptp/ptp_chardev.c | 4 + drivers/ptp/ptp_qoriq.c | 2 - include/linux/atmdev.h | 15 ++++ include/linux/bpf.h | 12 +++ include/linux/filter.h | 79 ++++++++++++++------ include/net/ip6_fib.h | 5 + include/rdma/ib_verbs.h | 13 ++- kernel/bpf/core.c | 69 ++++++++++++++++- kernel/bpf/devmap.c | 14 ++++ kernel/bpf/syscall.c | 12 +-- net/atm/br2684.c | 3 - net/atm/clip.c | 3 - net/atm/common.c | 3 - net/atm/lec.c | 3 - net/atm/mpc.c | 3 - net/atm/pppoatm.c | 3 - net/atm/raw.c | 4 + net/bpfilter/.gitignore | 1 net/bpfilter/Makefile | 6 +- net/core/dev.c | 4 + net/core/filter.c | 21 +---- net/ipv4/inet_hashtables.c | 4 + net/ipv4/ip_output.c | 3 + net/ipv6/inet6_hashtables.c | 4 + net/ipv6/ip6_fib.c | 5 + net/ipv6/ip6_output.c | 3 + net/ncsi/ncsi-aen.c | 10 +-- net/ncsi/ncsi-manage.c | 49 ++++++------ net/sched/act_ife.c | 12 +-- net/sched/sch_blackhole.c | 2 - net/xdp/xsk.c | 3 + tools/bpf/bpftool/perf.c | 5 + tools/bpf/bpftool/prog.c | 4 + tools/testing/selftests/bpf/config | 10 +++ tools/testing/selftests/bpf/test_offload.py | 12 +++ tools/testing/selftests/bpf/test_tunnel.sh | 26 ++++--- 60 files changed, 430 insertions(+), 228 deletions(-)