Skip to content
  • Jakub Kicinski's avatar
    7bca5021
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 7bca5021
    Jakub Kicinski authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter/IPVS updates for net-next
    
    1) Missing dependencies in NFT_BRIDGE_REJECT, from Randy Dunlap.
    
    2) Use atomic_inc_return() instead of atomic_add_return() in IPVS,
       from Yejune Deng.
    
    3) Simplify check for overquota in xt_nfacct, from Kaixu Xia.
    
    4) Move nfnl_acct_list away from struct net, from Miao Wang.
    
    5) Pass actual sk in reject actions, from Jan Engelhardt.
    
    6) Add timeout and protoinfo to ctnetlink destroy events,
       from Florian Westphal.
    
    7) Four patches to generalize set infrastructure to support
       for multiple expressions per set element.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next:
      netfilter: nftables: netlink support for several set element expressions
      netfilter: nftables: generalize set extension to support for several expressions
      netfilter: nftables: move nft_expr before nft_set
      netfilter: nftables: generalize set expressions support
      netfilter: ctnetlink: add timeout and protoinfo to destroy events
      netfilter: use actual socket sk for REJECT action
      netfilter: nfnl_acct: remove data from struct net
      netfilter: Remove unnecessary conversion to bool
      ipvs: replace atomic_add_return()
      netfilter: nft_reject_bridge: fix build errors due to code movement
    ====================
    
    Link: https://lore.kernel.org/r/20201212230513.3465-1-pablo@netfilter.org
    
    
    Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
    7bca5021
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
    Jakub Kicinski authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter/IPVS updates for net-next
    
    1) Missing dependencies in NFT_BRIDGE_REJECT, from Randy Dunlap.
    
    2) Use atomic_inc_return() instead of atomic_add_return() in IPVS,
       from Yejune Deng.
    
    3) Simplify check for overquota in xt_nfacct, from Kaixu Xia.
    
    4) Move nfnl_acct_list away from struct net, from Miao Wang.
    
    5) Pass actual sk in reject actions, from Jan Engelhardt.
    
    6) Add timeout and protoinfo to ctnetlink destroy events,
       from Florian Westphal.
    
    7) Four patches to generalize set infrastructure to support
       for multiple expressions per set element.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next:
      netfilter: nftables: netlink support for several set element expressions
      netfilter: nftables: generalize set extension to support for several expressions
      netfilter: nftables: move nft_expr before nft_set
      netfilter: nftables: generalize set expressions support
      netfilter: ctnetlink: add timeout and protoinfo to destroy events
      netfilter: use actual socket sk for REJECT action
      netfilter: nfnl_acct: remove data from struct net
      netfilter: Remove unnecessary conversion to bool
      ipvs: replace atomic_add_return()
      netfilter: nft_reject_bridge: fix build errors due to code movement
    ====================
    
    Link: https://lore.kernel.org/r/20201212230513.3465-1-pablo@netfilter.org
    
    
    Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Loading