diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-20 19:53:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-20 20:53:36 +0100 |
| commit | 2be09de7d6a06f58e768de1255a687c9aaa66606 (patch) | |
| tree | 298f9e04caf105873d987e807eccba27710a49cc /tools/testing/radix-tree/regression.h | |
| parent | Merge branch 'bnxt_en-next' (diff) | |
| parent | Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-2be09de7d6a06f58e768de1255a687c9aaa66606.tar.xz linux-2be09de7d6a06f58e768de1255a687c9aaa66606.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.
Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/radix-tree/regression.h')
| -rw-r--r-- | tools/testing/radix-tree/regression.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/radix-tree/regression.h b/tools/testing/radix-tree/regression.h index 3c8a1584e9ee..135145af18b7 100644 --- a/tools/testing/radix-tree/regression.h +++ b/tools/testing/radix-tree/regression.h @@ -5,5 +5,6 @@ void regression1_test(void); void regression2_test(void); void regression3_test(void); +void regression4_test(void); #endif |