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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2fc3b16 0bd5eee)

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	36c8e7fd2af2862957ed8db87e5a754a2bcc6da3
tree	b35860428acea35e5866d4cf007519ed943a85de	tree \| snapshot
parent	2fc3b16cae8f16c333169ca92c5fdcb92db8d41f	commit \| diff
parent	0bd5eee26787503d9740c104b7c9069ebb47f371	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 Kernel Source Tree.