Messages in this thread | | | Date | Tue, 22 Nov 2011 22:40:39 -0500 | From | Neil Horman <> | Subject | Re: linux-next: manual merge of the akpm tree with the net-next tree |
| |
On Wed, Nov 23, 2011 at 02:27:42PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm got a conflict in > include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add > network priority cgroup infrastructure (v4)") from the net-next tree and > commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the > akpm tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary. ACK, thanks Stephen. Neil
| |