From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 Jun 2017 21:35:22 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d09198243b89457649241fb63f809a96a22a8ce;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/davem/net

Two entries being added at the same time to the IFLA
policy table, whilst parallel bug fixes to decnet
routing dst handling overlapping with the dst gc removal
in net-next.

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

3d09198243b89457649241fb63f809a96a22a8ce
diff --cc net/core/rtnetlink.c
index 4aefa5a2625f,467a2f4510a7..8da89c1136e5
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@@ -1519,7 -1469,7 +1520,8 @@@ static const struct nla_policy ifla_pol
  	[IFLA_LINK_NETNSID]	= { .type = NLA_S32 },
  	[IFLA_PROTO_DOWN]	= { .type = NLA_U8 },
  	[IFLA_XDP]		= { .type = NLA_NESTED },
 +	[IFLA_EVENT]		= { .type = NLA_U32 },
+ 	[IFLA_GROUP]		= { .type = NLA_U32 },
  };
  
  static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {