diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-20 09:34:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-20 09:34:24 -0700 |
commit | 2615a38f142ffda863dece40120d7fe69af46490 (patch) | |
tree | dc8007bf28a1d91d74fc76f20fe8cad64672df41 /fs | |
parent | e46db8d2ef58f9b515f83be4608cef90ff9ae2c6 (diff) | |
parent | b60bf53abc0323f91ac59b08a7642216281e662e (diff) | |
download | linux-2615a38f142ffda863dece40120d7fe69af46490.tar.bz2 |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A few small fixes for timer drivers:
- Prevent infinite recursion in the arm architected timer driver with
ftrace
- Propagate error codes to the caller in case of failure in EM STI
driver
- Adjust a bogus loop iteration in the arm architected timer driver
- Add a missing Kconfig dependency to the pistachio clocksource to
prevent build failures
- Correctly check for IS_ERR() instead of NULL in the shared timer-of
code"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/arm_arch_timer: Avoid infinite recursion when ftrace is enabled
clocksource/drivers/Kconfig: Fix CLKSRC_PISTACHIO dependencies
clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL
clocksource/drivers/em_sti: Fix error return codes in em_sti_probe()
clocksource/drivers/arm_arch_timer: Fix mem frame loop initialization
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions