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

Stephen, On 4/30/20 22:30, Gustavo A. R. Silva wrote: >> This is now a conflict between the net-next and kspp-gustavo trees. >> > > Thanks for reporting this. I think the best solution, for now, is to remove > the > changes from my tree. I'll do it right away. > I just updated my -next tree.

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

Hi Stephen, On 4/30/20 22:12, Stephen Rothwell wrote: > Hi all, > > On Wed, 29 Apr 2020 12:06:25 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the mlx5-next tree got a conflict in: >> >> include/linux/mlx5/mlx5_ifc.h >> >> between commit: >> >> 3ba225b506a2 ("treewide:

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

Hi all, On Wed, 29 Apr 2020 12:06:25 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 3ba225b506a2 ("treewide: Replace zero-length array with flexible-array > member") > > from

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

Hi all, Today's linux-next merge of the mlx5-next tree got a conflict in: include/linux/mlx5/mlx5_ifc.h between commit: 3ba225b506a2 ("treewide: Replace zero-length array with flexible-array member") from the kspp-gustavo tree and commit: d65dbedfd298 ("net/mlx5: Add support for COPY