On Thu, Apr 30, 2020 at 02:25:06PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/dd.c
>
> between commits:
>
> ce68929f07de ("driver core: Revert default driver_deferred_probe_timeout value to 0")
> 4ccc03e28ec3 ("driver core: Use dev_warn() instead of dev_WARN() for deferred_probe_timeout warnings")
> 35a672363ab3 ("driver core: Ensure wait_for_device_probe() waits until the deferred_probe_timeout fires")
>
> from the driver-core.current tree and commit:
>
> eb7fbc9fb118 ("driver core: Add missing '\n' in log messages")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/base/dd.c
> index 94037be7f5d7,efe6df5bff26..000000000000
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@@ -258,8 -266,8 +258,8 @@@ int driver_deferred_probe_check_state(s
> return -ENODEV;
> }
>
> - if (!driver_deferred_probe_timeout) {
> - dev_WARN(dev, "deferred probe timeout, ignoring dependency\n");
> + if (!driver_deferred_probe_timeout && initcalls_done) {
> - dev_warn(dev, "deferred probe timeout, ignoring dependency");
> ++ dev_warn(dev, "deferred probe timeout, ignoring dependency\n");
> return -ETIMEDOUT;
> }
>
> @@@ -275,8 -283,7 +275,8 @@@ static void deferred_probe_timeout_work
> flush_work(&deferred_probe_work);
>
> list_for_each_entry_safe(private, p, &deferred_probe_pending_list, deferred_probe)
> - dev_info(private->device, "deferred probe pending");
> + dev_info(private->device, "deferred probe pending\n");
> + wake_up(&probe_timeout_waitqueue);
> }
> static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func);
>
Looks good, I'll handle this when the .linus branch gets merged into
Linus's tree.
thanks,
greg k-h
