git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Thomas Gleixner <tglx@linutronix.de>
	Thu, 11 Jun 2020 13:17:57 +0000 (15:17 +0200)
committer	Thomas Gleixner <tglx@linutronix.de>
	Thu, 11 Jun 2020 13:17:57 +0000 (15:17 +0200)
commit	261527ed1d87bb4ed3f5a1481bb2bec8542c9a79
tree	6b179c9aa84787773cb601a14a64255e2912154b	tree \| snapshot
parent	ca3a0d6e0fa57b3af09d7a1b4792488e4071fb09	commit \| diff
parent	2dab5a7e0a9b5737702ba4bd981ea19d22a89218	commit \| diff

Merge branch 'x86/entry' into ras/core

to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.

Linux Kernel Source Tree.

RSS Atom

arch/x86/include/asm/mce.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mce/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mce/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mce/internal.h	diff1 \|	diff2 \|	blob \| history
drivers/edac/amd64_edac.c	diff1 \|	diff2 \|	blob \| history
drivers/edac/skx_common.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/k10temp.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history