linux-next: manual merge of the akpm tree with Linus' tree

From: Stephen Rothwell
Date: Mon Jan 18 2016 - 21:42:40 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:


between commit:

cdb00777ffad ("tcp_memcontrol: Forward declare cgroup_subsys and mem_cgroup stucts")

from Linus' tree and commit:

"net: drop tcp_memcontrol.c"

from the akpm tree.

I fixed it up (the latter removed the file, so I did that) and can carry
the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx