diff options
author | 2017-03-17 14:05:03 -0700 | |
---|---|---|
committer | 2017-03-17 14:05:03 -0700 | |
commit | eab60d4e5bcc8990b7901829069b22e3b99e5889 (patch) | |
tree | 84b48f9e83f46caadc1eb1323a068bb1d93bf65d /fs/nfs | |
parent | Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | x86/mpx: Make unnecessarily global function static (diff) | |
download | linux-eab60d4e5bcc8990b7901829069b22e3b99e5889.tar.gz linux-eab60d4e5bcc8990b7901829069b22e3b99e5889.tar.bz2 linux-eab60d4e5bcc8990b7901829069b22e3b99e5889.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"An assorted pile of fixes along with some hardware enablement:
- a fix for a KASAN / branch profiling related boot failure
- some more fallout of the PUD rework
- a fix for the Always Running Timer which is not initialized when
the TSC frequency is known at boot time (via MSR/CPUID)
- a resource leak fix for the RDT filesystem
- another unwinder corner case fixup
- removal of the warning for duplicate NMI handlers because there are
legitimate cases where more than one handler can be registered at
the last level
- make a function static - found by sparse
- a set of updates for the Intel MID platform which got delayed due
to merge ordering constraints. It's hardware enablement for a non
mainstream platform, so there is no risk"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mpx: Make unnecessarily global function static
x86/intel_rdt: Put group node in rdtgroup_kn_unlock
x86/unwind: Fix last frame check for aligned function stacks
mm, x86: Fix native_pud_clear build error
x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
x86/platform/intel-mid: Add power button support for Merrifield
x86/platform/intel-mid: Use common power off sequence
x86/platform: Remove warning message for duplicate NMI handlers
x86/tsc: Fix ART for TSC_KNOWN_FREQ
x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions