Hi, This patchset removes the segment tree interval overlap/automerge codebase. This is replaced with mergesort of the set elements + check for overlaps by linearly iterating the set elements. This is passing tests/shell and tests/py. Pablo Neira Ayuso (5): src: add EXPR_F_KERNEL to identify expression in the kernel src: replace interval segment tree overlap and automerge src: remove rbtree datastructure mnl: update mnl_nft_setelem_del() to allow for more reuse intervals: add support to automerge with kernel elements include/Makefile.am | 2 +- include/expression.h | 7 +- include/intervals.h | 9 + include/mnl.h | 3 +- include/rbtree.h | 98 ------- include/rule.h | 3 + src/Makefile.am | 2 +- src/cache.c | 3 +- src/evaluate.c | 50 +++- src/intervals.c | 413 +++++++++++++++++++++++++++ src/mergesort.c | 1 + src/mnl.c | 6 +- src/netlink.c | 1 + src/rbtree.c | 388 ------------------------- src/rule.c | 25 +- src/segtree.c | 660 +------------------------------------------ 16 files changed, 510 insertions(+), 1161 deletions(-) create mode 100644 include/intervals.h delete mode 100644 include/rbtree.h create mode 100644 src/intervals.c delete mode 100644 src/rbtree.c -- 2.30.2
