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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

1 files changed, 14 insertions, 4 deletions

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index f93c5be612a7..2caaa84ce92d 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -124,8 +124,13 @@ static int l2tp_tunnel_notify(struct genl_family *family,
         ret = l2tp_nl_tunnel_send(msg, info->snd_portid, info->snd_seq,
                                   NLM_F_ACK, tunnel, cmd);
 
-        if (ret >= 0)
-                return genlmsg_multicast_allns(family, msg, 0,  0, GFP_ATOMIC);
+        if (ret >= 0) {
+                ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
+                /* We don't care if no one is listening */
+                if (ret == -ESRCH)
+                        ret = 0;
+                return ret;
+        }
 
         nlmsg_free(msg);
 
@@ -147,8 +152,13 @@ static int l2tp_session_notify(struct genl_family *family,
         ret = l2tp_nl_session_send(msg, info->snd_portid, info->snd_seq,
                                    NLM_F_ACK, session, cmd);
 
-        if (ret >= 0)
-                return genlmsg_multicast_allns(family, msg, 0,  0, GFP_ATOMIC);
+        if (ret >= 0) {
+                ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC);
+                /* We don't care if no one is listening */
+                if (ret == -ESRCH)
+                        ret = 0;
+                return ret;
+        }
 
         nlmsg_free(msg);