projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b838b4a 26b87c7)
Merge branch 'sctp'
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 16:46:29 +0000 (12:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 16:46:29 +0000 (12:46 -0400)
commitb27fa9939d50b0302888849c62ecae7b9cb85dc5
treebcdfcaa81a1808a36e96d11387dfd5f3e474577dtree | snapshot
parentb838b4aced99e0d31a272396d43d9ca21cb078cbcommit | diff
parent26b87c7881006311828bb0ab271a551a62dcceb4commit | diff
Merge branch 'sctp'

Daniel Borkmann says:

====================
Here are some SCTP fixes.

[ Note, immediate workaround would be to disable ASCONF (it
  is sysctl disabled by default). It is actually only used
  together with chunk authentication. ]
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
https://github.com/torvalds/linux.git