Merge tag 'v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 31 Aug 2018 03:39:19 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994709AbeHaBjdoZr42/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 01:50:56 2018 +0200 Commit: 0fb85967782f02bbf4571c199073596a5891d6cb Gitweb: https://git.linux-mips.org/g/ralf/linux/0fb85967782f Branch: master --- MAINTAINERS | 2 Makefile | 2 arch/arm64/crypto/aes-ce-ccm-core.S | 150 +++++++------------ arch/arm64/crypto/ghash-ce-core.S | 76 +++------- arch/parisc/Kconfig | 3 arch/parisc/include/asm/barrier.h | 32 ++++ arch/parisc/kernel/entry.S | 2 arch/parisc/kernel/pacache.S | 1 arch/parisc/kernel/syscall.S | 4 + arch/s390/Kconfig | 1 arch/x86/crypto/aegis128-aesni-glue.c | 12 +- arch/x86/crypto/aegis128l-aesni-glue.c | 12 +- arch/x86/crypto/aegis256-aesni-glue.c | 12 +- arch/x86/crypto/morus1280-avx2-glue.c | 10 - arch/x86/crypto/morus1280-sse2-glue.c | 10 - arch/x86/crypto/morus640-sse2-glue.c | 10 - drivers/block/zram/zram_drv.c | 15 ++ drivers/gpio/gpiolib-acpi.c | 56 +++++++ drivers/i2c/busses/i2c-xlp9xx.c | 41 ++++- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 6 - drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 30 +--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 + drivers/net/ethernet/ti/cpsw.c | 25 +-- drivers/net/ethernet/ti/cpsw_ale.c | 2 drivers/net/xen-netfront.c | 8 + drivers/scsi/fcoe/fcoe_ctlr.c | 6 - drivers/scsi/libfc/fc_rport.c | 1 drivers/scsi/mpt3sas/mpt3sas_base.c | 16 +- drivers/scsi/qedi/qedi_main.c | 2 drivers/scsi/qla2xxx/qla_iocb.c | 53 +++---- drivers/scsi/sr.c | 29 +++- drivers/scsi/vmw_pvscsi.c | 11 + drivers/vhost/vhost.c | 9 + fs/dcache.c | 13 +- fs/namespace.c | 28 +++- include/linux/cpu.h | 2 include/net/af_vsock.h | 4 - include/net/llc.h | 5 + init/main.c | 2 kernel/bpf/cpumap.c | 15 +- kernel/bpf/devmap.c | 14 +- kernel/bpf/sockmap.c | 9 + kernel/cpu.c | 2 lib/Kconfig.ubsan | 11 - mm/memory.c | 3 net/dccp/ccids/ccid2.c | 6 + net/dsa/slave.c | 4 - net/ipv6/ip6_tunnel.c | 8 - net/ipv6/route.c | 4 - net/llc/llc_core.c | 4 - net/packet/af_packet.c | 10 + net/rxrpc/ar-internal.h | 8 + net/rxrpc/conn_event.c | 4 - net/rxrpc/net_ns.c | 6 - net/rxrpc/output.c | 12 +- net/rxrpc/peer_event.c | 156 +++++++++++--------- net/rxrpc/peer_object.c | 8 + net/rxrpc/rxkad.c | 4 - net/smc/af_smc.c | 15 +- net/tipc/net.c | 4 - net/vmw_vsock/af_vsock.c | 15 +- net/vmw_vsock/vmci_transport.c | 3 samples/bpf/xdp_redirect_cpu_kern.c | 2 samples/bpf/xdp_redirect_cpu_user.c | 4 - scripts/Makefile.ubsan | 4 - tools/lib/bpf/btf.c | 2 tools/lib/bpf/btf.h | 2 tools/testing/selftests/bpf/test_sockmap.c | 2 71 files changed, 571 insertions(+), 487 deletions(-)