diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-02 13:52:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-02 13:52:23 -0500 |
| commit | d323b524e8bf5d8cb7669ab333a1509bfc5a76e5 (patch) | |
| tree | 3637bb31e2e09e4d30ce2135c5dd6d76997e00d8 /net/ipv4/inet_diag.c | |
| parent | e0b10844d9e617a1a5ce2ddf73d38aaa0a47a2a4 (diff) | |
| parent | 615dff228368109ce18b628d6bd1b01ad6ef2f74 (diff) | |
Merge branch 's390-next'
Julian Wiedmann says:
====================
s390/qeth: updates 2017-12-27
please apply some post-christmas leftovers for 4.16.
Two patches to improve IP address management on L3, and two that add
support to auto-config the transport mode on z/VM VNICs.
Note that one patch in the series touches arch/s390 (acked by Martin).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
0 files changed, 0 insertions, 0 deletions