Re: linux-next: manual merge of the driver-core tree with the rcu tree
From: Greg KH
Date: Fri Feb 10 2023 - 02:19:00 EST
On Fri, Feb 10, 2023 at 12:48:18PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/core.c
>
> between commit:
>
> dc7c31b07ade ("drivers/base: Remove CONFIG_SRCU")
>
> from the rcu tree and commit:
>
> 3a2dbc510c43 ("driver core: fw_devlink: Don't purge child fwnode's consumer links")
>
> from the driver-core tree.
>
> I fixed it up (see below) 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.
Fix looks good to me, thanks!
greg k-h