David Rientjes cd59085a9b memcg, kmem: fix build error when CONFIG_INET is disabled ... Commit e1aab161e0 ("socket: initial cgroup code.") causes a build error when CONFIG_INET is disabled in Linus' tree: net/built-in.o: In function `sk_update_clone': net/core/sock.c:1336: undefined reference to `sock_update_memcg' sock_update_memcg() is only defined when CONFIG_INET is enabled, so fix it by defining the dummy function without this option. Signed-off-by: David Rientjes <rientjes@google.com> Reported-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Glauber Costa <glommer@parallels.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2012-10-11 08:50:16 +09:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-10-08 07:14:06 +09:00
asm-generic	mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()	2012-10-09 16:22:53 +09:00
clocksource
crypto
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next	2012-10-07 21:13:54 +10:00
keys
linux	memcg, kmem: fix build error when CONFIG_INET is disabled	2012-10-11 08:50:16 +09:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-10-06 03:11:59 +09:00
pcmcia
ras
rdma	IB/core: Add ib_find_exact_cached_pkey()	2012-09-30 20:33:30 -07:00
rxrpc
scsi	Prepared for main script	2012-10-03 13:45:43 -07:00
sound	Sound updates for 3.7-rc1	2012-10-09 07:07:14 +09:00
target
trace	mm: remove __GFP_NO_KSWAPD	2012-10-09 16:22:15 +09:00
uapi	UAPI: (Scripted) Disintegrate include/drm	2012-10-04 18:21:50 +01:00
video	ARM: clps711x: Remove board support for CEIVA	2012-09-28 21:14:08 +02:00
xen	Features:	2012-10-07 07:13:01 +09:00
Kbuild