Re: [PATCH] net: sock: remove dead cgroup methods from struct proto

From: David Miller
Date: Thu Jan 21 2016 - 17:35:40 EST


From: Johannes Weiner <hannes@xxxxxxxxxxx>
Date: Thu, 21 Jan 2016 15:56:28 -0500

> From ac0fd0c5f31cdc73c52fd86f40af419c1871fbcf Mon Sep 17 00:00:00 2001
> From: Johannes Weiner <hannes@xxxxxxxxxxx>
> Date: Thu, 21 Jan 2016 13:34:47 -0500
> Subject: [PATCH] net: sock: remove dead cgroup methods from struct proto
>
> The cgroup methods are no longer used after baac50bbc3cd ("net:
> tcp_memcontrol: simplify linkage between socket and page counter").
> The hunk to delete them was included in the original patch but must
> have gotten lost during conflict resolution on the way upstream.
>
> Fixes: baac50bbc3cd ("net: tcp_memcontrol: simplify linkage between socket and page counter")
> Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>

Applied, thanks.