summaryrefslogtreecommitdiff
path: root/tools/testing
diff options
context:
space:
mode:
authorChristopher Covington <cov@codeaurora.org>2016-12-09 16:53:05 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-09 23:08:32 -0500
commitd33695fbfab73a4a6550fa5c2d0bacc68d7c5901 (patch)
treeed2934d9c9a66274968635f36200c26a32ef68d0 /tools/testing
parentab4e4c07aca7b33f8d00c5d6b083a564660ca8a5 (diff)
net: mlx5: Fix Kconfig help text
Since the following commit, Infiniband and Ethernet have not been mutually exclusive. Fixes: 4aa17b28 mlx5: Enable mutual support for IB and Ethernet Signed-off-by: Christopher Covington <cov@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing')
0 files changed, 0 insertions, 0 deletions
d2=54791b276b4000b307339f269d3bf7db877d536f'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Several small bug fixes and tidies, along with a fix for non-resumable memory errors triggered by userspace" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Handle PIO & MEM non-resumable errors. sparc64: Zero pages on allocation for mondo and error queues. sparc: Fixed typo in sstate.c. Replaced panicing with panicking sparc: use symbolic names for tsb indexing
Diffstat (limited to 'include/uapi/asm-generic/ipcbuf.h')