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

On Mon, Aug 17, 2026 at 10:40 PM Danilo Krummrich <[email protected]> wrote:
>
> On 8/17/26 5:56 PM, Mark Brown wrote:
> > diff --cc include/acpi/acpi_bus.h
> > index eaf13f6ac2d3a,7e57f9698f7ce..0000000000000
> > --- a/include/acpi/acpi_bus.h
> > +++ b/include/acpi/acpi_bus.h
> > @@@ -953,18 -996,6 +949,11 @@@ int acpi_scan_add_dep(acpi_handle handl
> >   u32 arch_acpi_add_auto_dep(acpi_handle handle);
> >   #else       /* CONFIG_ACPI */
> >
> >  +static inline struct device *acpi_bus_get_primary_device(struct acpi_device *adev)
> >  +{
> >  +    return NULL;
> >  +}
> >  +
> > - static inline bool acpi_of_match_device(const struct acpi_device *adev,
> > -                                     const struct of_device_id *of_match_table,
> > -                                     const struct of_device_id **of_id)
> > - {
> > -     return false;
> > - }
> > -
> >   static inline int register_acpi_bus_type(void *bus) { return 0; }
> >   static inline int unregister_acpi_bus_type(void *bus) { return 0; }
>
> Looks good to me, thanks!

It also looks good to me, thank you!