diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-19 16:48:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-19 16:48:54 -0700 |
| commit | fee9167214e8e515b2a1f68afc34187f2b59c182 (patch) | |
| tree | 8b12deac1bc4c988d12a8a868ec32161943bbc91 /fs/reiserfs/hashes.c | |
| parent | ae83e255045ed3cdc798664e8e189aa5cf2702eb (diff) | |
| parent | b89498a1c2941c00889dd025f52dcb653a5083bc (diff) | |
Merge master.kernel.org:/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.
Diffstat (limited to 'fs/reiserfs/hashes.c')
0 files changed, 0 insertions, 0 deletions