2023-12-11 04:30:41

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patches in the driver-core tree

Hi all,

The following commits are also in the pm tree tree as different
commits (but the same patches):

3babbf614ae6 ("device property: fwnode_property_get_reference_args allows NULL args now")
1eaea4b3604e ("software node: Let args be NULL in software_node_get_reference_args")
bef52aa0f3de ("acpi: property: Let args be NULL in __acpi_node_get_property_reference")

These are commits

a66cf024b377 ("device property: fwnode_property_get_reference_args() allows NULL args now")
b912c6530332 ("software node: Let args be NULL in software_node_get_reference_args")
cab48cbdfd27 ("ACPI: property: Let args be NULL in __acpi_node_get_property_reference()")

in the pm tree.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-12-11 07:16:30

by Greg KH

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the driver-core tree

On Mon, Dec 11, 2023 at 03:24:56PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the pm tree tree as different
> commits (but the same patches):
>
> 3babbf614ae6 ("device property: fwnode_property_get_reference_args allows NULL args now")
> 1eaea4b3604e ("software node: Let args be NULL in software_node_get_reference_args")
> bef52aa0f3de ("acpi: property: Let args be NULL in __acpi_node_get_property_reference")
>
> These are commits
>
> a66cf024b377 ("device property: fwnode_property_get_reference_args() allows NULL args now")
> b912c6530332 ("software node: Let args be NULL in software_node_get_reference_args")
> cab48cbdfd27 ("ACPI: property: Let args be NULL in __acpi_node_get_property_reference()")
>
> in the pm tree.

Thanks for letting us know, I think git can handle the merge here ok.

greg k-h