Merge branch 'timers/vdso' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 3 Jul 2019 08:50:21 +0000 (10:50 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 3 Jul 2019 08:50:21 +0000 (10:50 +0200)
commit341924049558e5f7c1a148a2c461a417933d35d9
tree1340b4f2131737ef4be63f18ee74cd73ad12cd3e
parent516337048fa40496ae5ca9863c367ec991a44d9a
parent4a8f81b8c053aad250ee247b219904ada72df9a4
Merge branch 'timers/vdso' into timers/core

so the hyper-v clocksource update can be applied.
12 files changed:
arch/arm64/include/asm/arch_timer.h
arch/x86/kvm/pmu.c
arch/x86/kvm/x86.c
drivers/clocksource/arc_timer.c
drivers/clocksource/arm_arch_timer.c
drivers/clocksource/exynos_mct.c
drivers/iio/industrialio-core.c
drivers/leds/trigger/ledtrig-activity.c
drivers/net/wireless/intel/iwlwifi/mvm/utils.c
drivers/net/wireless/mac80211_hwsim.c
include/net/cfg80211.h
kernel/bpf/syscall.c