Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23991087AbdEQGATDTu1n/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed May 17 07:59:37 2017 +0200 Commit: 59364572372467c3a4bb411c5358b4a330e92164 Gitweb: https://git.linux-mips.org/g/ralf/linux/593645723724 Branch: master --- arch/arm64/net/bpf_jit_comp.c | 5 arch/s390/include/asm/debug.h | 3 arch/s390/include/asm/dis.h | 2 arch/s390/include/asm/kprobes.h | 20 - arch/s390/include/asm/sysinfo.h | 2 arch/s390/kernel/debug.c | 8 arch/s390/kernel/entry.S | 21 + arch/s390/kernel/ftrace.c | 4 arch/s390/kernel/vmlinux.lds.S | 8 arch/s390/lib/probes.c | 1 arch/s390/lib/uaccess.c | 4 drivers/edac/amd64_edac.c | 40 +- drivers/firmware/efi/efi-pstore.c | 12 - drivers/net/dsa/mv88e6xxx/chip.c | 3 .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 13 - .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 12 - drivers/net/ethernet/mellanox/mlx4/main.c | 10 drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 9 drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 5 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 9 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 3 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 25 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 drivers/net/ethernet/mellanox/mlx5/core/ipoib.c | 11 .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 34 ++ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 3 drivers/net/ethernet/qualcomm/qca_spi.c | 10 drivers/net/ethernet/sfc/nic.h | 8 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 drivers/net/ethernet/sun/ldmvsw.c | 4 drivers/net/ethernet/ti/netcp_core.c | 6 drivers/net/ethernet/ti/netcp_ethss.c | 1 drivers/net/irda/irda-usb.c | 2 drivers/net/macvlan.c | 7 drivers/net/phy/mdio-mux.c | 11 drivers/net/phy/mdio_bus.c | 6 drivers/net/usb/ch9200.c | 4 drivers/net/vmxnet3/vmxnet3_drv.c | 5 drivers/net/vrf.c | 3 drivers/net/xen-netfront.c | 3 drivers/s390/cio/ccwgroup.c | 4 drivers/s390/cio/qdio_debug.h | 2 drivers/s390/net/qeth_core.h | 4 drivers/s390/net/qeth_core_main.c | 21 + drivers/s390/net/qeth_core_sys.c | 24 + drivers/s390/net/qeth_l2.h | 2 drivers/s390/net/qeth_l2_main.c | 26 + drivers/s390/net/qeth_l2_sys.c | 8 drivers/s390/net/qeth_l3_main.c | 8 drivers/s390/virtio/virtio_ccw.c | 2 drivers/soc/ti/knav_dma.c | 2 fs/cifs/cifsacl.c | 30 + fs/cifs/cifsglob.h | 2 fs/cifs/cifsproto.h | 3 fs/cifs/cifssmb.c | 11 fs/cifs/file.c | 2 fs/cifs/inode.c | 3 fs/cifs/smb2pdu.c | 21 - fs/cifs/transport.c | 4 fs/cifs/xattr.c | 6 include/linux/bpf_verifier.h | 4 include/linux/mlx5/fs.h | 4 include/linux/netdevice.h | 8 include/uapi/linux/bpf.h | 8 include/uapi/linux/if_link.h | 13 - kernel/bpf/syscall.c | 5 kernel/bpf/verifier.c | 133 +++++- net/core/dev.c | 57 ++- net/core/rtnetlink.c | 45 +- net/core/sock.c | 20 - net/dccp/ipv6.c | 6 net/ipv4/tcp_input.c | 9 net/ipv6/addrconf.c | 5 net/ipv6/tcp_ipv6.c | 2 net/packet/af_packet.c | 14 - net/sched/sch_api.c | 6 net/sctp/ipv6.c | 46 +- net/tipc/socket.c | 38 +- samples/bpf/cookie_uid_helper_example.c | 4 samples/bpf/offwaketime_user.c | 1 samples/bpf/sampleip_user.c | 1 samples/bpf/trace_event_user.c | 1 samples/bpf/tracex2_user.c | 1 samples/bpf/xdp1_user.c | 9 samples/bpf/xdp_tx_iptunnel_user.c | 8 tools/build/feature/test-bpf.c | 1 tools/include/uapi/linux/bpf.h | 11 tools/lib/bpf/bpf.c | 22 + tools/lib/bpf/bpf.h | 4 tools/testing/selftests/bpf/Makefile | 6 .../selftests/bpf/include/uapi/linux/types.h | 6 tools/testing/selftests/bpf/test_align.c | 453 ++++++++++++++++++++ 98 files changed, 1136 insertions(+), 354 deletions(-)