]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sctp-timestamp-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 03:23:23 +0000 (22:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 03:23:23 +0000 (22:23 -0500)
commitef3f9569e9de3b1c523c401c8291c5a0ed2a3f55
treead426ebf6b714b6cffa20281d789ef488b812d7c
parentc5fb8caaf91ea6a92920cf24db10cfc94d58de0f
parent50a5ffb1ef535e3c6989711c51b5d61b543a3b45
Merge branch 'sctp-timestamp-fixes'

Marcelo Ricardo Leitner says:

====================
sctp: packet timestamp fixes

These a couple of fixes regarding sctp/packet timestamps.

Dmitry Vyukov <dvyukov@google.com> reported the counter leak on missing
net_enable_timestamp() (2nd patch) and further testing here revealed the
other two issues.

Please consider these to -stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>