summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/sysctl
ModeNameSize
-rw-r--r--Makefile279logplain
-rw-r--r--common_tests1876logplain
-rwxr-xr-xrun_numerictests141logplain
-rwxr-xr-xrun_stringtests1589logplain
olspan='2' class='oid'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/lib.mk')