Re: linux-next: manual merge of the staging tree with the net-next tree

[Greg KH]

On Mon, Oct 23, 2023 at 02:47:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/qlge/qlge_devlink.c
> 
> between commit:
> 
>   3465915e9985 ("staging: qlge: devlink health: use retained error fmsg API")
> 
> from the net-next tree and commit:
> 
>   875be090928d ("staging: qlge: Retire the driver")
> 
> from the staging tree.
> 
> I fixed it up (I just deleted the file) 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.

Wonderful, thanks for deleting the file.

greg k-h