From: Linus Torvalds Date: Wed, 11 Sep 2013 02:43:23 +0000 (-0700) Subject: Merge branch 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip X-Git-Tag: v3.12-rc1~64 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=442e0973e9273ae8832abd70f52efde8b8326178;p=pandora-kernel.git Merge branch 'x86/jumplabel' of git://git./linux/kernel/git/tip/tip Pull x86 jumplabel changes from Peter Anvin: "One more x86 tree for this merge window. This tree improves the handling of jump labels, so that most of the time we don't have to do a massive initial patching run. Furthermore, we will error out of the jump label is not what is expected, eg if it has been corrupted or tampered with" * 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/jump-label: Show where and what was wrong on errors x86/jump-label: Add safety checks to jump label conversions x86/jump-label: Do not bother updating nops if they are correct x86/jump-label: Use best default nops for inital jump label calls --- 442e0973e9273ae8832abd70f52efde8b8326178 Reading git-diff-tree failed