From: David S. Miller Date: Fri, 9 May 2014 20:41:16 +0000 (-0400) Subject: Merge branch 'sctp_sysctl' X-Git-Tag: firefly_0821_release~176^2~3765^2~255 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=05ab2dae650e09add1c5295392b5516704c03a4b;p=firefly-linux-kernel-4.4.55.git Merge branch 'sctp_sysctl' Wang Weidong says: ==================== sctp: fix kfree static array pointer in sctp_sysctl_net_unregister patch #1 revert the efb842c45("sctp: optimize the sctp_sysctl_net_register") patch #2 add a checking for sctp_sysctl_net_register ==================== Acked-by: Neil Horman Signed-off-by: David S. Miller --- 05ab2dae650e09add1c5295392b5516704c03a4b