diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-15 12:44:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-15 12:44:23 -0700 |
commit | 52ac3777fc4514b17c0c4c548f941207a0fc06a7 (patch) | |
tree | 1ecbbee5fa941796ab65b609ed0a864f86a5378c /drivers/net/phy/bcm87xx.c | |
parent | b67775e124572a7028e930c306ed68cc2f90b29b (diff) | |
parent | 59b5809655bdafb0767d3fd00a3e41711aab07e6 (diff) | |
download | linux-52ac3777fc4514b17c0c4c548f941207a0fc06a7.tar.gz linux-52ac3777fc4514b17c0c4c548f941207a0fc06a7.tar.bz2 linux-52ac3777fc4514b17c0c4c548f941207a0fc06a7.zip |
Merge tag 'ras-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS fixes from Thomas Gleixner:
"Two RAS related fixes:
- Shut down the per CPU thermal throttling poll work properly when a
CPU goes offline.
The missing shutdown caused the poll work to be migrated to a
unbound worker which triggered warnings about the usage of
smp_processor_id() in preemptible context
- Fix the PPIN feature initialization which missed to enable the
functionality when PPIN_CTL was enabled but the MSR locked against
updates"
* tag 'ras-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Fix logic and comments around MSR_PPIN_CTL
x86/mce/therm_throt: Undo thermal polling properly on CPU offline
Diffstat (limited to 'drivers/net/phy/bcm87xx.c')
0 files changed, 0 insertions, 0 deletions