Merge remote-tracking branch 'origin/master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>

Conflicts:
	include/nftables.h
	src/main.c

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index 14152398..c363fc88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,7 @@ static void show_help(const char *name)
 "  -a/--handle			Output rule handle.\n"
 "  -I/--includepath <directory>	Add <directory> to the paths searched for include files.\n"
 #ifdef DEBUG
-"  --debug <level [,level...]>	Specify debugging level (scanner, parser, eval, netlink, proto-ctx, all)\n"
+"  --debug <level [,level...]>	Specify debugging level (scanner, parser, eval, netlink, proto-ctx, segtree, all)\n"
 #endif
 "\n",
 	name);
@@ -143,6 +143,10 @@ static const struct {
 		.level		= DEBUG_PROTO_CTX,
 	},
 	{
+		.name		= "segtree",
+		.level		= DEBUG_SEGTREE,
+	},
+	{
 		.name		= "all",
 		.level		= ~0,
 	},