From: Linus Torvalds Date: Sun, 14 Dec 2014 19:51:50 +0000 (-0800) Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.19-rc1~86 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=536e89ee53e9cbdec00e49ae1888bffa262043d8 Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "Misc fixes (mainly Andy's TLS fixes), plus a cleanup" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tls: Disallow unusual TLS segments x86/tls: Validate TLS entries to protect espfix MAINTAINERS: Add me as x86 VDSO submaintainer x86/asm: Unify segment selector defines x86/asm: Guard against building the 32/64-bit versions of the asm-offsets*.c file directly x86_64, switch_to(): Load TLS descriptors before switching DS and ES x86/mm: Use min() instead of min_t() in the e820 printout code x86/mm: Fix zone ranges boot printout x86/doc: Update documentation after file shuffling --- 536e89ee53e9cbdec00e49ae1888bffa262043d8 diff --cc MAINTAINERS index f273cb58d2e8,7a54fa88018a..9ef141a913cf --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -10485,8 -10295,15 +10485,15 @@@ L: linux-edac@vger.kernel.or S: Maintained F: arch/x86/kernel/cpu/mcheck/* + X86 VDSO + M: Andy Lutomirski + L: linux-kernel@vger.kernel.org + T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso + S: Maintained + F: arch/x86/vdso/ + XC2028/3028 TUNER DRIVER -M: Mauro Carvalho Chehab +M: Mauro Carvalho Chehab L: linux-media@vger.kernel.org W: http://linuxtv.org T: git git://linuxtv.org/media_tree.git