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

diff --cc include/nftables.h
index 801000e1f92e236328de96124e2abb23be65503c,f9891619dae397f4549f50904a54a9895a314c80..225bf951c89b7a5d2ff8d718f5abae324c971352
--- 1/include/nftables.h
--- 2/include/nftables.h
+++ b/include/nftables.h
@@@ -17,7 -17,7 +17,8 @@@ enum debug_level 
        DEBUG_PARSER            = 0x2,
        DEBUG_EVALUATION        = 0x4,
        DEBUG_NETLINK           = 0x8,
 -      DEBUG_SEGTREE           = 0x10,
 +      DEBUG_PROTO_CTX         = 0x10,
++      DEBUG_SEGTREE           = 0x20,
  };
  
  #define INCLUDE_PATHS_MAX     16

diff --cc src/main.c
index 1415239832bcd83f8036472177191ce81cf62eca,d78eea79ba93a1040de21633b2a2b6d0ebeda79e..c363fc8850a8cd1a3cd6c3a872002a4a7b174c77
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -111,7 -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, segtree, all)\n"
++"  --debug <level [,level...]>        Specify debugging level (scanner, parser, eval, netlink, proto-ctx, segtree, all)\n"
  #endif
  "\n",
        name);
@@@ -138,10 -138,10 +138,14 @@@ static const struct 
                .name           = "netlink",
                .level          = DEBUG_NETLINK,
        },
 +      {
 +              .name           = "proto-ctx",
 +              .level          = DEBUG_PROTO_CTX,
 +      },
+       {
+               .name           = "segtree",
+               .level          = DEBUG_SEGTREE,
+       },
        {
                .name           = "all",
                .level          = ~0,