summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-01 11:45:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-01 11:45:26 -0800
commitca04d396a3229d37d8151311ad70d1255a5807bd (patch)
treecd261e4e1215c2af61fe106f7f8265387c4a901e /arch/cris
parentf5eab26701999b1aa26d06772e013b11c4a16f6a (diff)
parent2459ee8651dc5ab72790c2ffa99af288c7641b64 (diff)
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 set of updates contains: - Another bugfix for the pathologic vm86 machinery. Clear thread.vm86 on fork to prevent corrupting the parent state. This comes along with an update to the vm86 selftest case - Fix another corner case in the ioapic setup code which causes a boot crash on some oddball systems - Fix the fallout from the dma allocation consolidation work, which leads to a NULL pointer dereference when the allocation code is called with a NULL device" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/vm86: Set thread.vm86 to NULL on fork/clone selftests/x86: Add a fork() to entry_from_vm86 to catch fork bugs x86/ioapic: Prevent NULL pointer dereference in setup_ioapic_dest() x86/dma-mapping: Fix arch_dma_alloc_attrs() oops with NULL dev
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions