From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA76AC83009 for ; Thu, 30 Apr 2020 08:15:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AF2D2073E for ; Thu, 30 Apr 2020 08:15:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="okXjo4Ut"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="gDNDrbyI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726658AbgD3IPc (ORCPT ); Thu, 30 Apr 2020 04:15:32 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60547 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726596AbgD3IPb (ORCPT ); Thu, 30 Apr 2020 04:15:31 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 6E8195C00E7; Thu, 30 Apr 2020 04:15:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 30 Apr 2020 04:15:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=vftGE7rXgB48AHwPWrZZjNjKTNb wd8gbxpiL8fgB6Sk=; b=okXjo4Utd/ya/jwoNazuWTUk441cI0/uExpwq+7dDKs Ne+yu43+r9bWUMy344IdIB1ZXSpDhUjyiLOZEXEq0WeSY3nxPy/EpWeJT4BLV42h 8S5BZQVgJy0x3oDmIQys1hX/dW8GBRxgriXQGTPkvsdvfA4ZYBes1PYINrIogeuG uWprbjPbbTxrXa3miCXICj/zIL5MvxRqNjFfcMPgtLcGrQhxwRtWseDB+mdxnYrN IWd9sYpZDv6a3Xtk9jlHhm9DJOIeZEXxPsd/Za4BIQiOd2UPAZ2ukh9TBXhX8BER I6ho4/e1O1c3PjtWf5RdaWOA+/XjVmTWySKAjJM+0zg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=vftGE7 rXgB48AHwPWrZZjNjKTNbwd8gbxpiL8fgB6Sk=; b=gDNDrbyIQapEpFTwd77d4L BQJYwtam6D2W+vv7eQEhPmiy6lml5Ntigi3sQaqkmPLMlH8DbJWETM+wDn8PnQH8 o8Lu7BNMThWjle/A40pz/2pixJfh82IEeiUWBKYSB8qN2oEo5eE42+SCfOQkInqU XlP4fQjLlmoo4eQp6uQz0NGtT9qUOtLZN8UKpgtSa/ZWWg/oLVQVWa20/lotLmTa /kkXkATX8dXu/sY0EoZrdWhm4J5JjQl/boBBCyE74TcyzSaFWY03CwM883SylOJb 0diHLnq6RCsOAUoUzr9mww4vZak3t2kaPdn49/9AHm/ljNuUK0d9Uyd2bccXQi0A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrieehgddtudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuheejgf ffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecukfhppeekfedr keeirdekledruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 89F4E3065F07; Thu, 30 Apr 2020 04:15:27 -0400 (EDT) Date: Thu, 30 Apr 2020 10:15:25 +0200 From: Greg KH To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Christophe JAILLET , John Stultz Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree Message-ID: <20200430081525.GA2496246@kroah.com> References: <20200430142506.0626f8c4@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200430142506.0626f8c4@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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