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

From: "Gustavo A. R. Silva" <[email-masked]>
Date: Thu, 17 Feb 2022 07:05:37 -0600

On Thu, Feb 17, 2022 at 02:16:03PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/r8188eu/include/ieee80211.h
> 
> between commit:
> 
>   fbe9ccfe809d ("treewide: Replace zero-length arrays with flexible-array members")
> 
> from the kspp-gustavo tree and commit:
> 
>   6c36bcbfcef7 ("staging: r8188eu: remove unused structs from ieee80211.h")
> 
> from the staging tree.
> 
> I fixed it up (the latter removed the structs updated by the former) 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.

I just fixed this up in my -next tree.

Thanks for the report, Stephen.
--
Gustavo