Reference in a new issue

Blame

Copy permalink

Reference in a new issue

Copy permalink

Tejun Heo edab95103d cgroup: Merge branch 'memcg_event' into for-3.14 ... Merge v3.12 based patch series to move cgroup_event implementation to memcg into for-3.14. The following two commits cause a conflict in kernel/cgroup.c 2ff2a7d03b ("cgroup: kill css_id") 79bd9814e5 ("cgroup, memcg: move cgroup_event implementation to memcg") Each patch removes a struct definition from kernel/cgroup.c. As the two are adjacent, they cause a context conflict. Easily resolved by removing both structs. Signed-off-by: Tejun Heo <tj@kernel.org>		History 2013-11-22 18:32:25 -05:00
..
calibrate.c	kernel: delete __cpuinit usage from all core kernel files	2013-07-14 19:36:59 -04:00
do_mounts.c	init/do_mounts.c: add maj:min syntax comment	2013-11-13 12:09:12 +09:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_initrd.c	usermodehelper: split remaining calls to call_usermodehelper_fns()	2013-04-30 17:04:06 -07:00
do_mounts_md.c	init: disable sparse checking of the mount.o source files	2012-05-31 17:49:27 -07:00
do_mounts_rd.c	./Makefile: export initial ramdisk compression config option	2013-11-13 12:09:36 +09:00
init_task.c	sched/rt: Move rt specific bits into new header file	2013-02-07 20:51:08 +01:00
initramfs.c	init, block: try to load default elevator module early during boot	2013-01-18 14:05:56 -08:00
Kconfig	cgroup: Merge branch 'memcg_event' into for-3.14	2013-11-22 18:32:25 -05:00
main.c	Revert "mm: create a separate slab for page->ptl allocation"	2013-11-20 14:41:47 -08:00
Makefile	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	proc: Split the namespace stuff out into linux/proc_ns.h	2013-05-01 17:29:39 -04:00