Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/dsa/b53/b53_priv.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/socionext/netsec.c
Simple merge

diff --cc drivers/net/ethernet/ti/davinci_emac.c
Simple merge

diff --cc drivers/net/tun.c
index 2265d2c,23e9eb6..c94fffe
--- 1/drivers/net/tun.c
--- 2/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@@ -1941,15 -1929,13 +1943,16 @@@ static ssize_t tun_get_user(struct tun_
                        }
                }
                rcu_read_unlock();
+               local_bh_enable();
        }
  
 -      rcu_read_lock();
 -      if (!rcu_dereference(tun->steering_prog))
 +      /* Compute the costly rx hash only if needed for flow updates.
 +       * We may get a very small possibility of OOO during switching, not
 +       * worth to optimize.
 +       */
 +      if (!rcu_access_pointer(tun->steering_prog) && tun->numqueues > 1 &&
 +          !tfile->detached)
                rxhash = __skb_get_hash_symmetric(skb);
 -      rcu_read_unlock();
  
        if (frags) {
                /* Exercise flow dissector code path. */

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc include/uapi/linux/bpf.h
index 9b8c6e3,8c31773..6714861
--- 1/include/uapi/linux/bpf.h
--- 2/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -2332,17 -1031,9 +2332,18 @@@ struct bpf_map_info 
        __u32 map_flags;
        char  name[BPF_OBJ_NAME_LEN];
        __u32 ifindex;
+       __u32 :32;
        __u64 netns_dev;
        __u64 netns_ino;
 +      __u32 btf_id;
 +      __u32 btf_key_type_id;
 +      __u32 btf_value_type_id;
 +} __attribute__((aligned(8)));
 +
 +struct bpf_btf_info {
 +      __aligned_u64 btf;
 +      __u32 btf_size;
 +      __u32 id;
  } __attribute__((aligned(8)));
  
  /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/ipv6/seg6_iptunnel.c
Simple merge

diff --cc net/ipv6/xfrm6_policy.c
Simple merge

diff --cc net/ncsi/ncsi-netlink.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
index 2e8fd96,501e48a..ca4c4d9
--- 1/net/netfilter/nf_tables_api.c
--- 2/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@@ -1336,24 -1298,12 +1336,26 @@@ static void nft_chain_stats_replace(str
                rcu_assign_pointer(chain->stats, newstats);
                synchronize_rcu();
                free_percpu(oldstats);
-       } else
+       } else {
                rcu_assign_pointer(chain->stats, newstats);
+               static_branch_inc(&nft_counters_enabled);
+       }
  }
  
 +static void nf_tables_chain_free_chain_rules(struct nft_chain *chain)
 +{
 +      struct nft_rule **g0 = rcu_dereference_raw(chain->rules_gen_0);
 +      struct nft_rule **g1 = rcu_dereference_raw(chain->rules_gen_1);
 +
 +      if (g0 != g1)
 +              kvfree(g1);
 +      kvfree(g0);
 +
 +      /* should be NULL either via abort or via successful commit */
 +      WARN_ON_ONCE(chain->rules_next);
 +      kvfree(chain->rules_next);
 +}
 +
  static void nf_tables_chain_destroy(struct nft_ctx *ctx)
  {
        struct nft_chain *chain = ctx->chain;

diff --cc net/netfilter/nf_tables_core.c
Simple merge

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/netfilter/nft_meta.c
Simple merge

diff --cc net/sched/cls_flower.c
index 4e74508,c79f6e7..3786fea
--- 1/net/sched/cls_flower.c
--- 2/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@@ -1024,11 -976,8 +1024,11 @@@ static int fl_change(struct net *net, s
        kfree(tb);
        return 0;
  
 +errout_mask:
 +      fl_mask_put(head, fnew->mask, false);
 +
  errout_idr:
-       if (fnew->handle)
+       if (!fold)
                idr_remove(&head->handle_idr, fnew->handle);
  errout:
        tcf_exts_destroy(&fnew->exts);

diff --cc tools/include/uapi/linux/bpf.h
index 9b8c6e3,8c31773..6714861
--- 1/tools/include/uapi/linux/bpf.h
--- 2/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@@ -2332,17 -1031,9 +2332,18 @@@ struct bpf_map_info 
        __u32 map_flags;
        char  name[BPF_OBJ_NAME_LEN];
        __u32 ifindex;
+       __u32 :32;
        __u64 netns_dev;
        __u64 netns_ino;
 +      __u32 btf_id;
 +      __u32 btf_key_type_id;
 +      __u32 btf_value_type_id;
 +} __attribute__((aligned(8)));
 +
 +struct bpf_btf_info {
 +      __aligned_u64 btf;
 +      __u32 btf_size;
 +      __u32 id;
  } __attribute__((aligned(8)));
  
  /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed