diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-10 15:24:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-10 15:24:27 -0700 |
| commit | 25ed57b86fb9f7770f396469b023c0e6a45b66a8 (patch) | |
| tree | 8b6237bb247ca5642a9f10fccabf25d0a908aca9 /drivers | |
| parent | b55353e2cc1415c1ece3ae34a856309b40bb0b4b (diff) | |
| parent | 22ef473dbd66a5241b6cedc186abca5a3a4eb922 (diff) | |
| download | linux-25ed57b86fb9f7770f396469b023c0e6a45b66a8.tar.gz linux-25ed57b86fb9f7770f396469b023c0e6a45b66a8.tar.bz2 linux-25ed57b86fb9f7770f396469b023c0e6a45b66a8.zip | |
Merge branch 'smc-next'
Karsten Graul says:
====================
net/smc: updates 2020-09-10
Please apply the following patch series for smc to netdev's net-next tree.
This patch series is a mix of various improvements and cleanups.
The patches 1 and 10 improve the handling of large parallel workloads.
Patch 8 corrects a kernel config default for config CCWGROUP on s390.
Patch 9 allows userspace tools to retrieve socket information for more
sockets.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index 53120e68796e..bf236d474538 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig @@ -107,7 +107,7 @@ config QETH_OSX config CCWGROUP tristate - default (LCS || CTCM || QETH) + default (LCS || CTCM || QETH || SMC) config ISM tristate "Support for ISM vPCI Adapter" |