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=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 74C8FC0650E for ; Wed, 3 Jul 2019 13:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E62B218B0 for ; Wed, 3 Jul 2019 13:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726490AbfGCNEo (ORCPT ); Wed, 3 Jul 2019 09:04:44 -0400 Received: from mga11.intel.com ([192.55.52.93]:38821 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbfGCNEo (ORCPT ); Wed, 3 Jul 2019 09:04:44 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2019 06:04:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,446,1557212400"; d="scan'208";a="166525294" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.145]) by orsmga003.jf.intel.com with ESMTP; 03 Jul 2019 06:04:41 -0700 Received: from andy by smile with local (Exim 4.92) (envelope-from ) id 1hiewB-00050t-TM; Wed, 03 Jul 2019 16:04:39 +0300 Date: Wed, 3 Jul 2019 16:04:39 +0300 From: Andy Shevchenko To: Stephen Rothwell Cc: Greg KH , "Rafael J. Wysocki" , Linux Next Mailing List , Linux Kernel Mailing List , Suzuki K Poulose Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree Message-ID: <20190703130439.GR9224@smile.fi.intel.com> References: <20190701183249.34c928ce@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190701183249.34c928ce@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Jul 01, 2019 at 06:32:49PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/acpi/sleep.c > > between commit: > > a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()") > > from the pm tree and commit: > > 418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device") > > from the driver-core tree. > > I fixed it up (the former removed the code modified by the latter) 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. Thank you, the fix looks correct! > > -- > Cheers, > Stephen Rothwell -- With Best Regards, Andy Shevchenko