This fixes an old bug in iproute2's ss command because it was
reading slabinfo to get statistics. There isn't a better API
to do this, and one can argue that /proc is a UAPI that must
not change.

Therefore this patch set adds a flag to slab to give another
reason to prevent merging, and then uses it in network code.

The patches are against davem's linux-net tree and should also
goto stable as well.

Stephen Hemminger (2):
  slab: add flag to block merging of UAPI elements
  net: mark slab's used by ss as UAPI

 include/linux/slab.h | 6 ++++++
 mm/slab_common.c     | 2 +-
 net/ipv4/tcp.c       | 3 ++-
 net/ipv4/tcp_ipv4.c  | 2 +-
 net/ipv6/tcp_ipv6.c  | 2 +-
 net/socket.c         | 6 +++---
 6 files changed, 14 insertions(+), 7 deletions(-)

-- 
2.16.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>