Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2026-09-28 19:20:30 +00:00 · 2017-11-13 09:39:12 -03:00 · 2017-11-13 09:39:12 -03:00 · 7862edc419
commit 7862edc419
parent fcdfafcb73 516fb7f2e7
114 changed files with 707 additions and 314 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/9
+++ b/9
--- a/25
+++ b/25
--- a/2
+++ b/2
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
--- a/arch/mips/kernel/smp-bmips.c
+++ b/arch/mips/kernel/smp-bmips.c
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
--- a/arch/x86/kernel/cpu/aperfmperf.c
+++ b/arch/x86/kernel/cpu/aperfmperf.c
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
--- a/arch/x86/kernel/idt.c
+++ b/arch/x86/kernel/idt.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
--- a/drivers/input/rmi4/rmi_smbus.c
+++ b/drivers/input/rmi4/rmi_smbus.c
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/can/c_can/c_can_pci.c
+++ b/drivers/net/can/c_can/c_can_pci.c
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
--- a/drivers/net/can/ifi_canfd/ifi_canfd.c
+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
--- a/drivers/net/can/peak_canfd/peak_pciefd_main.c
+++ b/drivers/net/can/peak_canfd/peak_pciefd_main.c
--- a/drivers/net/can/sun4i_can.c
+++ b/drivers/net/can/sun4i_can.c
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
--- a/lib/asn1_decoder.c
+++ b/lib/asn1_decoder.c
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
--- a/net/sched/cls_cgroup.c
+++ b/net/sched/cls_cgroup.c
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
--- a/Show more
+++ b/Show more