git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3442a9e d978280)

author	Ingo Molnar <mingo@kernel.org>
	Wed, 25 Mar 2020 14:20:44 +0000 (15:20 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 25 Mar 2020 14:20:44 +0000 (15:20 +0100)
commit	629b3df7ecb01fddfdf71cb5d3c563d143117c33
tree	a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b	tree \| snapshot
parent	3442a9ecb8e72a33c28a2b969b766c659830e410	commit \| diff
parent	d97828072d0bcecb6655f0966efc38a2647d3dfb	commit \| diff

Merge branch 'x86/cpu' into perf/core, to resolve conflict

Conflicts:
arch/x86/events/intel/uncore.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

arch/x86/events/intel/uncore.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)