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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f584dd3 0ecfebd)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 8 Jul 2019 16:04:41 +0000 (18:04 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 8 Jul 2019 16:04:41 +0000 (18:04 +0200)
commit	552a031ba12a4236be107a5b082a399237758a5d
tree	a2bcdeb651b360013dbb654bbcd61dbaf51e0331	tree \| snapshot
parent	f584dd32edc5d4400d7ceb92111a89f0c1f6651f	commit \| diff
parent	0ecfebd2b52404ae0c54a878c872bb93363ada36	commit \| diff

Merge tag 'v5.2' into perf/core, to pick up fixes

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/events/perf_event.h	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history

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