From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
John Stultz <john.stultz@linaro.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Thu, 30 Apr 2020 10:15:25 +0200 [thread overview]
Message-ID: <20200430081525.GA2496246@kroah.com> (raw)
In-Reply-To: <20200430142506.0626f8c4@canb.auug.org.au>
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
next prev parent reply other threads:[~2020-04-30 8:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 4:25 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2020-04-30 8:15 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-12-09 3:47 Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2013-06-19 5:32 Stephen Rothwell
2013-06-19 5:55 ` Greg KH
2013-06-19 6:58 ` Ming Lei
2013-06-19 14:39 ` Greg KH
2013-06-19 15:04 ` Ming Lei
2013-06-19 16:36 ` Greg KH
2013-06-20 0:23 ` Ming Lei
2013-06-20 1:06 ` Stephen Rothwell
2013-06-20 1:22 ` Ming Lei
2013-06-20 3:28 ` Greg KH
2013-06-20 3:46 ` Ming Lei
2013-06-20 3:49 ` Stephen Rothwell
2013-06-19 7:12 ` Stephen Rothwell
2013-06-19 7:21 ` Ming Lei
2012-02-03 3:51 Stephen Rothwell
2012-02-03 15:07 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430081525.GA2496246@kroah.com \
--to=greg@kroah.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).