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.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham 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 922F3C04EB8 for ; Mon, 10 Dec 2018 09:03:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FBB72082F for ; Mon, 10 Dec 2018 09:03:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FBB72082F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726872AbeLJJDC (ORCPT ); Mon, 10 Dec 2018 04:03:02 -0500 Received: from mga07.intel.com ([134.134.136.100]:63206 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726675AbeLJJDB (ORCPT ); Mon, 10 Dec 2018 04:03:01 -0500 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2018 01:03:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,337,1539673200"; d="scan'208";a="109127974" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.86]) by orsmga003.jf.intel.com with ESMTP; 10 Dec 2018 01:02:58 -0800 Received: from andy by smile with local (Exim 4.91) (envelope-from ) id 1gWHSr-0005V9-QQ; Mon, 10 Dec 2018 11:02:57 +0200 Date: Mon, 10 Dec 2018 11:02:57 +0200 From: Andy Shevchenko To: "Rafael J. Wysocki" Cc: Stephen Rothwell , Greg KH , Linux Next Mailing List , Linux Kernel Mailing List , Heikki Krogerus Subject: Re: linux-next: manual merge of the driver-core tree with the pm tree Message-ID: <20181210090257.GY10650@smile.fi.intel.com> References: <20181210161454.1c8ca97f@canb.auug.org.au> <9045374.omvoRxFOEf@aspire.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9045374.omvoRxFOEf@aspire.rjw.lan> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 10, 2018 at 09:58:53AM +0100, Rafael J. Wysocki wrote: > On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the driver-core tree got a conflict in: > > > > drivers/base/platform.c > > u > > between commit: > > > > 2d51ac9086fd ("driver core: platform: Remove duplicated device_remove_properties() call") > > > > from the pm tree and commit: > > > > 99fef587ff98 ("driver core: platform: Respect return code of platform_device_register_full()") > > > > 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. > > The fix looks good to me, thank you! Confirm, the result looks as it supposed to be. Thanks! -- With Best Regards, Andy Shevchenko