Merge remote-tracking branch 'pidfd-fixes/fixes' into master

diff --cc fs/namespace.c
Simple merge

diff --cc include/net/net_namespace.h
Simple merge

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc kernel/pid.c
Simple merge

diff --cc kernel/pid_namespace.c
Simple merge

diff --cc kernel/user_namespace.c
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/core/net_namespace.c
index dbc66b896287a49df15e3ca76eb9b6db27c73153,5f658cbedd3431213c94dd9727c9e104fe640247..2ef3b4557f40d72d27a1642d98f1e8f06caf9835
--- 1/net/core/net_namespace.c
--- 2/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@@ -249,13 -248,13 +249,13 @@@ int peernet2id_alloc(struct net *net, s
  {
        int id;
  
-       if (refcount_read(&net->count) == 0)
+       if (refcount_read(&net->ns.count) == 0)
                return NETNSA_NSID_NOT_ASSIGNED;
  
 -      spin_lock(&net->nsid_lock);
 +      spin_lock_bh(&net->nsid_lock);
        id = __peernet2id(net, peer);
        if (id >= 0) {
 -              spin_unlock(&net->nsid_lock);
 +              spin_unlock_bh(&net->nsid_lock);
                return id;
        }
  

diff --cc net/ipv4/tcp_metrics.c
Simple merge