diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 22:35:45 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 22:35:45 +0200 |
commit | 644bca1d48139ad77570c24d22bafaf8e438cf03 (patch) | |
tree | 37db3b2976c7d4f1c4541fe6946582d242a405a2 /net | |
parent | net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() (diff) | |
parent | bonding: add xdp_features support (diff) | |
download | linux-644bca1d48139ad77570c24d22bafaf8e438cf03.tar.xz linux-644bca1d48139ad77570c24d22bafaf8e438cf03.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
There's a fix which landed in net-next, pull it in along
with the couple of minor cleanups.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/9p/Kconfig b/net/9p/Kconfig index deabbd376cb1..00ebce9e5a65 100644 --- a/net/9p/Kconfig +++ b/net/9p/Kconfig @@ -17,6 +17,8 @@ if NET_9P config NET_9P_FD default NET_9P + imply INET + imply UNIX tristate "9P FD Transport" help This builds support for transports over TCP, Unix sockets and |