Merge branch 'sctp-accept-deadlock'
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Sep 2015 04:03:40 +0000 (21:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Sep 2015 04:03:40 +0000 (21:03 -0700)
commit51359bfc5b7111cada4d10e71b4dcdd1085e1a8f
tree43ead3fc2c0b7395b6cb4ac5bf0aa7b92a8eea85
parent43ae93a93e8c95c5e6389dc8e11704712b1ab2e9
parent635682a14427d241bab7bbdeebb48a7d7b91638e
Merge branch 'sctp-accept-deadlock'

Karl Heiss says:

====================
sctp: Fix SCTP deadlock

These patches fix a deadlock during accept() of an SCTP connection.

The first patch fixes whitespace issues.

The second patch actually fixes the deadlock race.
====================

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