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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d82fed7 81a84ad)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
commit	edc2988c548db05e33b921fed15821010bc74895
tree	b35860428acea35e5866d4cf007519ed943a85de	tree \| snapshot
parent	d82fed75294229abc9d757f08a4817febae6c4f4	commit \| diff
parent	81a84ad3cb5711cec79f4dd53a4ce026b092c432	commit \| diff

Merge branch 'linus' into locking/core, to fix up conflicts

Conflicts:
mm/page_alloc.c

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

drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history

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