Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Greg KH]

On Tue, Mar 17, 2026 at 04:19:33PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/of/base.c
> 
> between commit:
> 
>   82b6c1b542ea0 ("of: Add of_machine_get_match() helper")
> 
> from the devicetree tree and commits:
> 
>   59621105ffca7 ("of: provide of_machine_read_compatible()")
>   c86d3b7b847cc ("of: provide of_machine_read_model()")
> 
> 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, thanks!

greg k-h