From: David S. Miller <davem@davemloft.net>
Date: Wed, 16 Jul 2014 21:41:10 +0000 (-0700)
Subject: Merge branch 'sctp-next'
X-Git-Tag: v3.17-rc1~106^2~151
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ed410ecf71a5924676ceb561f53a03119f27d925;p=~emulex%2Finfiniband.git

Merge branch 'sctp-next'

Daniel Borkmann says:

====================
SCTP updates

This set improves the SCTP socket API to be more in line with RFC6458,
Geir and myself have finalized it eventually. While at it, the first
patch also fixes two possible information leaks that should go to net
tree as well (therefore the change is already here in net-next via a
merge of the 'net' tree -DaveM). For more details, I refer you to the
patches themselves.

Thanks a lot.

v1 -> v2:
 - Added 6th patch to deprecate SCTP_SNDRCV, rest unchanged
====================

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

ed410ecf71a5924676ceb561f53a03119f27d925