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

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2 files changed, 2 insertions, 0 deletions

diff --git a/net/tipc/group.c b/net/tipc/group.c
index 03086ccb7746..d7a7befeddd4 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
@@ -189,6 +189,7 @@ struct tipc_group *tipc_group_create(struct net *net, u32 portid,
         grp->loopback = mreq->flags & TIPC_GROUP_LOOPBACK;
         grp->events = mreq->flags & TIPC_GROUP_MEMBER_EVTS;
         grp->open = group_is_open;
+        *grp->open = false;
         filter |= global ? TIPC_SUB_CLUSTER_SCOPE : TIPC_SUB_NODE_SCOPE;
         if (tipc_topsrv_kern_subscr(net, portid, type, 0, ~0,
                                     filter, &grp->subid))
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f93477187a90..8b04e601311c 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -473,6 +473,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
         sk->sk_write_space = tipc_write_space;
         sk->sk_destruct = tipc_sock_destruct;
         tsk->conn_timeout = CONN_TIMEOUT_DEFAULT;
+        tsk->group_is_open = true;
         atomic_set(&tsk->dupl_rcvcnt, 0);
 
         /* Start out with safe limits until we receive an advertised window */