xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Lots of easy overlapping changes in the confict
resolutions here.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2018-05-26 19:46:15 -04:00
parent e52cde7170 bc2dbc5420
commit 5b79c2af66
200 changed files with 2628 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/9p/Kconfig
View File

@@ -32,7 +32,7 @@ config NET_9P_XEN
config NET_9P_RDMA
depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS
depends on INET && INFINIBAND_ADDR_TRANS
tristate "9P RDMA Transport (Experimental)"
help
This builds support for an RDMA transport.