Merge git://git.kernel.org/pub/scm/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>

diff --cc Documentation/devicetree/bindings/net/dsa/b53.txt
Simple merge

diff --cc arch/arm/boot/dts/sunxi-h3-h5.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
Simple merge

diff --cc drivers/infiniband/core/addr.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/qedr.h
Simple merge

diff --cc drivers/infiniband/hw/qedr/verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

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

diff --cc net/core/rtnetlink.c
index 4aefa5a2625f9ad47fed27912df39cacca3fc44c,467a2f4510a74cad48209b696532838d1edcf96e..8da89c1136e5026c4a3953508da4b2765be2844c
--- 1/net/core/rtnetlink.c
--- 2/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] = {

diff --cc net/decnet/dn_route.c
Simple merge

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

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge