diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-26 11:14:04 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-26 11:14:04 -0700 |
commit | 2800348613953b5892c196e4bfab2ae5783a519e (patch) | |
tree | 228813308b3f34ee67e5fe84a7e0e7675ea14f34 /Makefile | |
parent | 26ae19a3883c9d595e9100fd10b856a7cf1a949a (diff) | |
parent | 1a4e8795711f474b31ff6eac37f3efd304ed8a93 (diff) | |
download | op-kernel-dev-2800348613953b5892c196e4bfab2ae5783a519e.zip op-kernel-dev-2800348613953b5892c196e4bfab2ae5783a519e.tar.gz |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"This update contains:
- the manual revert of the SYSCALL32 changes which caused a
regression
- a fix for the MPX vma handling
- three fixes for the ioremap 'is ram' checks.
- PAT warning fixes
- a trivial fix for the size calculation of TLB tracepoints
- handle old EFI structures gracefully
This also contains a PAT fix from Jan plus a revert thereof. Toshi
explained why the code is correct"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm/pat: Revert 'Adjust default caching mode translation tables'
x86/asm/entry/32: Revert 'Do not use R9 in SYSCALL32' commit
x86/mm: Fix newly introduced printk format warnings
mm: Fix bugs in region_is_ram()
x86/mm: Remove region_is_ram() call from ioremap
x86/mm: Move warning from __ioremap_check_ram() to the call site
x86/mm/pat, drivers/media/ivtv: Move the PAT warning and replace WARN() with pr_warn()
x86/mm/pat, drivers/infiniband/ipath: Replace WARN() with pr_warn()
x86/mm/pat: Adjust default caching mode translation tables
x86/fpu: Disable dependent CPU features on "noxsave"
x86/mpx: Do not set ->vm_ops on MPX VMAs
x86/mm: Add parenthesis for TLB tracepoint size calculation
efi: Handle memory error structures produced based on old versions of standard
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions