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

[Greg KH]

On Mon, Jan 30, 2023 at 02:31:16PM +0200, Andy Shevchenko wrote:
> On Mon, Jan 30, 2023 at 03:32:29PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the driver-core tree got a conflict in:
> > 
> >   include/linux/acpi.h
> > 
> > between commit:
> > 
> >   1b94ad7ccc21 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs")
> > 
> > from the net-next tree and commit:
> > 
> >   162736b0d71a ("driver core: make struct device_type.uevent() take a const *")
> > 
> > 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.
> 
> Seems correct, thank you!

Looks good to me too, thanks!

greg k-h