OSDN Git Service

Merge branch 'smc-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Jul 2018 17:57:14 +0000 (10:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Jul 2018 17:57:14 +0000 (10:57 -0700)
commit6a525818b135d72f3706b5114174e5215c217054
tree787942fe151b13a62bb9e6fee59eb52ee347b8ac
parent9a2ad3623868752e4f4d0a04a4dc43d5fcde07ce
parent48bf5231771c7e3961c8326353b6027b1bed6eb5
Merge branch 'smc-next'

Ursula Braun says:

====================
net/smc: patches 2018-07-23

here are some small patches for SMC: Just the first patch contains a
functional change. It allows to differ between the modes SMCR and SMCD
on s390 when monitoring SMC sockets. The remaining patches are cleanups
without functional changes.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>