Ana Rey (4): src: proto: fixed a rreply symbol src: proto: fixed a rreply symbol nftables: Fix list of sets by family rule: fix crash in set listing Arturo Borrero (4): netlink: delete unused variable netlink: fix chain attribute parsing src: fix expr_binary_error()-related compilation warnings ct: add support for setting ct mark Arturo Borrero Gonzalez (2): ruleset: add XML/JSON export expression: fix constant expression allocation on big endian Eric Leblond (1): src: add support for queue Florian Westphal (6): netlink_delinearize: meta: fix wrong type in attributes ct: direction should be integer, not bitmask ct: connlabel matching support datatype: don't leak file ptr on error expr: do not suppress OP_EQ when RHS is bitmask type build: drop AC_FUNC_MALLOC/REALLOC Pablo Neira Ayuso (7): netlink: add support to set meta keys build: use libnftnl instead of libnftables in configure.in bump release number to 0.100 mnl: fix inclusion of last rule in batch page Merge branch 'master' into next-3.14 meta: remove line break when printing priority src: add support for rule human-readable comments Patrick McHardy (67): expr: replace PAYLOAD_PROTOCOL_EXPR by generic flag nftables: generic procotol contexts expr: add protocol context update callback proto: add helper function to update protocol context proto: add debugging for protocol context updates ct expr: protocol context updates and dynamic typing include: resync nftables.h with kernel nftables: add support for the "inet" family netlink_delinearize: remove implied meta expressions proto: add support for meta templates meta: add nfproto support meta: add l4proto support Merge remote-tracking branch 'origin/master' into next-3.14 netlink_delinearize: fix compiler warning Merge remote-tracking branch 'origin/master' into next-3.14 Merge remote-tracking branch 'origin/master' into next-3.14 Merge remote-tracking branch 'origin/master' into next-3.14 expr: remove secmark from ct and meta expression meta: don't require "meta" keyword for a subset of meta expressions Merge branch 'master' into next-3.14 Merge branch 'master' into next-3.14 Merge remote-tracking branch 'origin/master' into next-3.14 Merge remote-tracking branch 'origin/master' into next-3.14 parser: use symbolic expressions for parsing keywords as protocol values Merge remote-tracking branch 'origin/master' into next-3.14 Merge remote-tracking branch 'origin/master' into next-3.14 cmd: add create command for tables and chains set: add abstract set descriptions Revert "set: add abstract set descriptions" evaluate: determine implicit relational op before RHS constant checks scanner: don't update location's line_offset for newlines scanner: update last_line in struct location erec: skip includes with INDESC_INTERNAL parser: close scope when encountering an error in a table or chain block parser: recover from errors in any block parser: evaluate commands immediately after parsing tests: add two tests for error reporting parser: prohibit redefinitions of symbols and verify existance on use files: add inet filter table definition cmd: initialize cmd list and use list_splice_tail() for adding to command list netlink: add netlink specific location eval: use list_splice_tail() properly netlink_linearize: fix flagcmp op Merge branch 'next-3.14' of git.netfilter.org:nftables into next-3.14 evaluate: use flagcmp for single RHS bitmask expression binop: take care of operator precedence when printing binop arguments netlink_delinarize: convert *all* bitmask values into individual bit values netlink: fix prefix expression handling expr: make expr_binary_error() usable outside of evaluation expr: add comparison function for singleton expressions set: abort on interval conflicts netlink: use set location for IO errors parser: add grammatical distinction for verdict maps set: properly account set size when merging recursive set definitions segtree: sort set elements before decomposition utils: fix -Wcast-align warnings on sparc parser: fix ether keyword clash Merge branch 'master' of git.netfilter.org:nftables gmputil: use MSF/LSF in import/export functions dependant on host byte order netlink: fix length value of concat data build: fix documentation build doc: documentation update datatypes: rename some types for more consistency doc: fix programlisting indentation doc: change documentation license to CC BY-SA 4.0 doc: fix make install problems Bump version to v0.2