From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 19 May 2006 23:48:54 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: firefly_0821_release~35748
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fee9167214e8e515b2a1f68afc34187f2b59c182;p=firefly-linux-kernel-4.4.55.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [SCTP]: Allow linger to abort 1-N style sockets.
  [SCTP]: Validate the parameter length in HB-ACK chunk.
  [SCTP]: Respect the real chunk length when walking parameters.
  [SCTP]: A better solution to fix the race between sctp_peeloff() and
  [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.
---

fee9167214e8e515b2a1f68afc34187f2b59c182