linux-next: manual merge of the net-next tree with the kspp-gustavo tree

2020-08-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: lib/nlattr.c between commit: 58e813cceabd ("treewide: Use fallthrough pseudo-keyword") from the kspp-gustavo tree and commit: 8aa26c575fb3 ("netlink: make NLA_BINARY validation more flexible") from the net-next tr

linux-next: manual merge of the net-next tree with the kspp-gustavo tree

2020-04-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c between commit: 3ba225b506a2 ("treewide: Replace zero-length array with flexible-array member") from the kspp-gustavo tree and commit: 4780dbdbd957 ("mlxsw: spec