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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 1 May 2020 12:55:00 +1000

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: spectrum_span: Replace zero-length array with flexible-array member")

from the net-next tree (and further changes).

I fixed it up (they had the same effect on this file, so I used the
latter) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell