[PATCH] fix rebase issue

From: Yury Norov
Date: Thu Jan 02 2020 - 13:27:09 EST


Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
---
lib/test_bitmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c
index 830c9b195e405..a4ecf6f04a5be 100644
--- a/lib/test_bitmap.c
+++ b/lib/test_bitmap.c
@@ -349,7 +349,6 @@ static const struct test_bitmap_parselist parselist_tests[] __initconst = {
{-EINVAL, "0-31:a/1", NULL, 8, 0},
{-EINVAL, "0-\n", NULL, 8, 0},

-#undef step
};

static void __init __test_bitmap_parselist(int is_user)
@@ -430,6 +429,7 @@ static const struct test_bitmap_parselist parse_tests[] __initconst = {
{-EOVERFLOW, "badf00d,deadbeef,1,0", NULL, 90, 0},
{-EOVERFLOW, "fbadf00d,deadbeef,1,0", NULL, 95, 0},
{-EOVERFLOW, "badf00d,deadbeef,1,0", NULL, 100, 0},
+#undef step
};

static void __init __test_bitmap_parse(int is_user)
--
2.20.1