diff options
author | 2016-08-08 12:51:59 -0700 | |
---|---|---|
committer | 2016-08-08 12:51:59 -0700 | |
commit | 05ec40f06ae98a6711337e5a7caefbf046f4c9ab (patch) | |
tree | 60a69fb3cb3cf7838b4c09df657975d1c7182221 /lib/test_rhashtable.c | |
parent | net: macb: Correct CAPS mask (diff) | |
parent | sctp_diag: Respect ss adding TCPF_CLOSE to idiag_states (diff) | |
download | linux-dev-05ec40f06ae98a6711337e5a7caefbf046f4c9ab.tar.xz linux-dev-05ec40f06ae98a6711337e5a7caefbf046f4c9ab.zip |
Merge branch 'sctp_diag-fixes'
Phil Sutter says:
====================
sctp_diag: A bunch of fixes for upcoming 'ss' support
The following series contains a number of fixes necessary to make my yet
unpublished 'ss' support patch functional.
Changes since v1:
- Fixed patch 2/3
- Rebased whole series onto current net-next/master
Changes since v2:
- Improved description of patch 2/3
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/test_rhashtable.c')
0 files changed, 0 insertions, 0 deletions