| commit | 05ec40f06ae98a6711337e5a7caefbf046f4c9ab | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Aug 08 12:51:59 2016 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Aug 08 12:51:59 2016 -0700 |
| tree | 60a69fb3cb3cf7838b4c09df657975d1c7182221 | |
| parent | c518189567eaf42b2ec50a4d982484c8e38799f8 [diff] | |
| parent | 1ba8d77f410d3b7423df39e8a10a02af272d3c42 [diff] |
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>