1. 06 Aug, 2018 38 commits
  2. 05 Aug, 2018 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 074fb880
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for your net-next tree:
      
      1) Support for transparent proxying for nf_tables, from Mate Eckl.
      
      2) Patchset to add OS passive fingerprint recognition for nf_tables,
         from Fernando Fernandez. This takes common code from xt_osf and
         place it into the new nfnetlink_osf module for codebase sharing.
      
      3) Lightweight tunneling support for nf_tables.
      
      4) meta and lookup are likely going to be used in rulesets, make them
         direct calls. From Florian Westphal.
      
      A bunch of incremental updates:
      
      5) use PTR_ERR_OR_ZERO() from nft_numgen, from YueHaibing.
      
      6) Use kvmalloc_array() to allocate hashtables, from Li RongQing.
      
      7) Explicit dependencies between nfnetlink_cttimeout and conntrack
         timeout extensions, from Harsha Sharma.
      
      8) Simplify NLM_F_CREATE handling in nf_tables.
      
      9) Removed unused variable in the get element command, from
         YueHaibing.
      
      10) Expose bridge hook priorities through uapi, from Mate Eckl.
      
      And a few fixes for previous Netfilter batch for net-next:
      
      11) Use per-netns mutex from flowtable event, from Florian Westphal.
      
      12) Remove explicit dependency on iptables CT target from conntrack
          zones, from Florian.
      
      13) Fix use-after-free in rmmod nf_conntrack path, also from Florian.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      074fb880
    • David S. Miller's avatar
      Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net · c1c8626f
      David S. Miller authored
      Lots of overlapping changes, mostly trivial in nature.
      
      The mlxsw conflict was resolving using the example
      resolution at:
      
      https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.cSigned-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c1c8626f