Merge drm-upstream/drm-next into drm-misc-next

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 252a52ae0893..6be21575503a 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1516,10 +1516,10 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
 
         srcaddr->sock.family = AF_TIPC;
         srcaddr->sock.addrtype = TIPC_ADDR_ID;
+        srcaddr->sock.scope = 0;
         srcaddr->sock.addr.id.ref = msg_origport(hdr);
         srcaddr->sock.addr.id.node = msg_orignode(hdr);
         srcaddr->sock.addr.name.domain = 0;
-        srcaddr->sock.scope = 0;
         m->msg_namelen = sizeof(struct sockaddr_tipc);
 
         if (!msg_in_group(hdr))
@@ -1528,6 +1528,7 @@ static void tipc_sk_set_orig_addr(struct msghdr *m, struct sk_buff *skb)
         /* Group message users may also want to know sending member's id */
         srcaddr->member.family = AF_TIPC;
         srcaddr->member.addrtype = TIPC_ADDR_NAME;
+        srcaddr->member.scope = 0;
         srcaddr->member.addr.name.name.type = msg_nametype(hdr);
         srcaddr->member.addr.name.name.instance = TIPC_SKB_CB(skb)->orig_member;
         srcaddr->member.addr.name.domain = 0;