1. 21 Jun, 2015 10 commits
  2. 20 Jun, 2015 1 commit
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 12011962
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains a final Netfilter pull request for net-next
      4.2. This mostly addresses some fallout from the previous pull request, small
      netns updates and a couple of new features for nfnetlink_log and the socket
      match that didn't get in time for the previous pull request. More specifically
      they are:
      
      1) Add security context information to nfnetlink_queue, from Roman Kubiak.
      
      2) Add support to restore the sk_mark into skb->mark through xt_socket,
         from Harout Hedeshian.
      
      3) Force alignment of 16 bytes of per cpu xt_counters, from Eric Dumazet.
      
      4) Rename br_netfilter.c to br_netfilter_hooks.c to prepare split of IPv6 code
         into a separated file.
      
      5) Move the IPv6 code in br_netfilter into a separated file.
      
      6) Remove unused RCV_SKB_FAIL() in nfnetlink_queue and nfetlink_log, from Eric
         Biederman.
      
      7) Two liner to simplify netns logic in em_ipset_match().
      
      8) Add missing includes to net/net_namespace.h to avoid compilation problems
         that result from not including linux/netfilter.h in netns headers.
      
      9) Use a forward declaration instead of including linux/proc_fs.h from
         netns/netfilter.h
      
      10) Add a new linux/netfilter_defs.h to replace the linux/netfilter.h inclusion
          in netns headers.
      
      11) Remove spurious netfilter.h file included in the net tree, also from Eric
          Biederman.
      
      12) Fix x_tables compilation warnings on 32 bits platforms that resulted from
          recent changes in x_tables counters, from Florian Westphal.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      12011962
  3. 18 Jun, 2015 14 commits
  4. 17 Jun, 2015 15 commits