diff options
| author | Linus Torvalds <[email protected]> | 2018-07-22 00:23:58 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-07-22 00:23:58 +0000 |
| commit | 43227e098c36b6338d55bfb232ab52896f782cda (patch) | |
| tree | 3376c1e10b52eb370ddf9294300e47d115cfe300 /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86/apm: Don't access __preempt_count with zeroed fs (diff) | |
| download | kernel-43227e098c36b6338d55bfb232ab52896f782cda.tar.gz kernel-43227e098c36b6338d55bfb232ab52896f782cda.zip | |
Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 pti fixes from Ingo Molnar:
"An APM fix, and a BTS hardware-tracing fix related to PTI changes"
* 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apm: Don't access __preempt_count with zeroed fs
x86/events/intel/ds: Fix bts_interrupt_threshold alignment
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions