Merge branch 'timers/vdso' into timers/core

so the hyper-v clocksource update can be applied.

diff --cc arch/arm64/include/asm/arch_timer.h
Simple merge

diff --cc arch/x86/kvm/pmu.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/clocksource/arc_timer.c
Simple merge

diff --cc drivers/clocksource/arm_arch_timer.c
Simple merge

diff --cc drivers/clocksource/exynos_mct.c
Simple merge

diff --cc drivers/iio/industrialio-core.c
Simple merge

diff --cc drivers/leds/trigger/ledtrig-activity.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/utils.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge