]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9275b93 7127126)
Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Wed, 8 Nov 2017 09:55:48 +0000 (10:55 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 8 Nov 2017 09:55:48 +0000 (10:55 +0100)
The UMIP series is based on top of changes already queued up in the x86/mpx branch,
so merge it.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/lib/Makefile patch | diff1 | diff2 | blob | history
arch/x86/mm/mpx.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/lib/Makefile
Simple merge
diff --cc arch/x86/mm/mpx.c
Simple merge
local clone of linux.git