Merge tag 'v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Fri, 02 Feb 2018 13:21:50 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994887AbeBBMVxc4JyP/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Feb 2 12:50:14 2018 +0100 Commit: fe2511afde398caa4f39032c2c9ce8d42c4494d3 Gitweb: https://git.linux-mips.org/g/ralf/linux/fe2511afde39 Branch: master --- MAINTAINERS | 28 +- Makefile | 2 arch/s390/kvm/kvm-s390.c | 18 + arch/sparc/crypto/Makefile | 2 arch/x86/events/amd/power.c | 2 arch/x86/events/intel/ds.c | 33 +-- arch/x86/include/asm/asm-prototypes.h | 1 arch/x86/kernel/Makefile | 5 arch/x86/kernel/cpu/microcode/core.c | 2 arch/x86/kernel/cpu/microcode/intel.c | 20 +- arch/x86/kernel/ftrace_64.S | 26 +- arch/x86/kernel/unwind_orc.c | 48 ++++ arch/x86/lib/retpoline.S | 1 arch/x86/mm/fault.c | 22 +- arch/x86/mm/tlb.c | 34 ++- arch/x86/pci/fixup.c | 32 ++- drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 46 +++- drivers/gpu/drm/vc4/vc4_gem.c | 33 ++- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 drivers/input/joystick/xpad.c | 19 ++ drivers/input/mouse/trackpoint.c | 245 ++++++++++++-------- drivers/input/mouse/trackpoint.h | 34 ++- drivers/input/rmi4/rmi_f01.c | 12 + drivers/input/touchscreen/s6sy761.c | 15 - drivers/input/touchscreen/stmfts.c | 15 - .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 7 - drivers/net/ethernet/emulex/benet/be_main.c | 9 + drivers/net/ethernet/ibm/emac/core.c | 6 drivers/net/ethernet/ibm/emac/emac.h | 4 drivers/net/ethernet/ibm/ibmvnic.c | 73 +++++- drivers/net/ethernet/ibm/ibmvnic.h | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 6 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 10 - drivers/net/ethernet/qlogic/qed/qed_rdma.c | 31 +-- drivers/net/ethernet/realtek/r8169.c | 9 - drivers/net/geneve.c | 4 drivers/net/ppp/pppoe.c | 11 - drivers/net/usb/usbnet.c | 8 - drivers/net/vmxnet3/vmxnet3_drv.c | 2 drivers/net/vrf.c | 5 drivers/net/vxlan.c | 6 drivers/vhost/vhost.c | 6 fs/btrfs/delayed-inode.c | 26 +- fs/nfsd/auth.c | 6 fs/orangefs/devorangefs-req.c | 3 fs/orangefs/file.c | 7 - fs/orangefs/orangefs-kernel.h | 11 - fs/orangefs/waitqueue.c | 4 include/linux/ftrace.h | 2 include/linux/jump_label.h | 7 + include/linux/swapops.h | 21 ++ include/linux/vermagic.h | 8 - include/net/dst.h | 8 + include/net/ipv6.h | 1 include/net/net_namespace.h | 10 + include/net/pkt_cls.h | 2 kernel/events/core.c | 47 +++- kernel/futex.c | 6 kernel/jump_label.c | 12 + kernel/locking/lockdep.c | 2 kernel/sched/fair.c | 4 kernel/time/hrtimer.c | 3 kernel/trace/ftrace.c | 29 +- kernel/trace/trace.c | 34 ++- kernel/trace/trace_events_trigger.c | 13 + kernel/trace/trace_functions.c | 49 +++- mm/page_vma_mapped.c | 66 +++-- net/core/dev.c | 19 +- net/dccp/ccids/ccid2.c | 3 net/ipv4/esp4_offload.c | 3 net/ipv4/igmp.c | 2 net/ipv4/ip_tunnel.c | 3 net/ipv4/ip_vti.c | 2 net/ipv4/tcp.c | 3 net/ipv4/tcp_offload.c | 3 net/ipv4/tcp_timer.c | 15 + net/ipv4/udp_offload.c | 3 net/ipv4/xfrm4_mode_tunnel.c | 1 net/ipv6/esp6_offload.c | 3 net/ipv6/ip6_output.c | 2 net/ipv6/ip6_tunnel.c | 6 net/ipv6/ip6_vti.c | 2 net/ipv6/ipv6_sockglue.c | 2 net/ipv6/sit.c | 4 net/ipv6/tcpv6_offload.c | 3 net/ipv6/udp_offload.c | 3 net/ipv6/xfrm6_mode_tunnel.c | 1 net/kcm/kcmsock.c | 25 ++ net/rds/tcp.c | 5 net/rds/tcp.h | 2 net/rds/tcp_send.c | 4 net/sched/em_nbyte.c | 2 net/sctp/offload.c | 3 net/tls/tls_sw.c | 2 net/vmw_vsock/af_vsock.c | 2 net/xfrm/xfrm_device.c | 1 net/xfrm/xfrm_state.c | 12 + net/xfrm/xfrm_user.c | 18 + 99 files changed, 965 insertions(+), 474 deletions(-)