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.3 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 8114CC32750 for ; Tue, 13 Aug 2019 09:15:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C3EE20663 for ; Tue, 13 Aug 2019 09:15:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728712AbfHMJPy (ORCPT ); Tue, 13 Aug 2019 05:15:54 -0400 Received: from mga06.intel.com ([134.134.136.31]:30997 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727559AbfHMJPo (ORCPT ); Tue, 13 Aug 2019 05:15:44 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Aug 2019 01:50:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,380,1559545200"; d="scan'208";a="200414319" Received: from rjwysock-mobl1.ger.corp.intel.com (HELO [10.249.129.248]) ([10.249.129.248]) by fmsmga004.fm.intel.com with ESMTP; 13 Aug 2019 01:50:06 -0700 Subject: Re: linux-next: manual merge of the driver-core tree with the rcu tree To: Stephen Rothwell , Greg KH , "Paul E. McKenney" Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Joel Fernandes (Google)" References: <20190813155048.59dd9bdf@canb.auug.org.au> From: "Rafael J. Wysocki" Organization: Intel Technology Poland Sp. z o. o., KRS 101882, ul. Slowackiego 173, 80-298 Gdansk Message-ID: <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com> Date: Tue, 13 Aug 2019 10:50:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190813155048.59dd9bdf@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/13/2019 7:50 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/base/power/runtime.c > > between commit: > > 4a3a5474b4c1 ("driver/core: Convert to use built-in RCU list checking") > > from the rcu tree and commit: > > 515db266a9da ("driver core: Remove device link creation limitation") > > 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, thanks!