diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-11 08:56:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-11 08:56:01 -0700 |
commit | 8001a975f955f532d8d0c27b224d58646e202f2a (patch) | |
tree | 1cbd45380d5de43c8f0cee10cdcf092c997fb84f /net/ipv4/xfrm4_state.c | |
parent | b2dbdf2ca1d2803e9cdc46a94554c4a39ffb235a (diff) | |
parent | 96ea91e7b6ee2c406598d859e7348b4829404eea (diff) |
Merge tag 'powerpc-4.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"All fixes for code that went in this cycle.
- a revert of an optimisation to the syscall exit path, which could
lead to an oops on either older machines or machines with > 1TB of
memory
- disable some deep idle states if the firmware configuration for
them fails
- re-enable HARD/SOFT lockup detectors in defconfigs after a Kconfig
change
- six fairly small patches fixing bugs in our new watchdog code
Thanks to: Gautham R Shenoy, Nicholas Piggin"
* tag 'powerpc-4.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/watchdog: add locking around init/exit functions
powerpc/watchdog: Fix marking of stuck CPUs
powerpc/watchdog: Fix final-check recovered case
powerpc/watchdog: Moderate touch_nmi_watchdog overhead
powerpc/watchdog: Improve watchdog lock primitive
powerpc: NMI IPI improve lock primitive
powerpc/configs: Re-enable HARD/SOFT lockup detectors
powerpc/powernv/idle: Disable LOSE_FULL_CONTEXT states when stop-api fails
Revert "powerpc/64: Avoid restore_math call if possible in syscall exit"
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
0 files changed, 0 insertions, 0 deletions