diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /net/9p | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 (diff) | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/Kconfig b/net/9p/Kconfig index 46c39f7da444..e6014e0e51f7 100644 --- a/net/9p/Kconfig +++ b/net/9p/Kconfig | |||
| @@ -32,7 +32,7 @@ config NET_9P_XEN | |||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | config NET_9P_RDMA | 34 | config NET_9P_RDMA |
| 35 | depends on INET && INFINIBAND_ADDR_TRANS | 35 | depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS |
| 36 | tristate "9P RDMA Transport (Experimental)" | 36 | tristate "9P RDMA Transport (Experimental)" |
| 37 | help | 37 | help |
| 38 | This builds support for an RDMA transport. | 38 | This builds support for an RDMA transport. |