Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 13 Aug 2019 07:22:59 -0700
From:   "Paul E. McKenney" <paulmck@linux.ibm.com>
To:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Joel Fernandes (Google)" <joel@joelfernandes.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the rcu
 tree
Message-ID: <20190813142259.GZ28441@linux.ibm.com>
Reply-To: paulmck@linux.ibm.com
References: <20190813155048.59dd9bdf@canb.auug.org.au>
 <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <0d7ff624-dce3-3961-b9a6-7de8eba2bdee@intel.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Aug 13, 2019 at 10:50:05AM +0200, Rafael J. Wysocki wrote:
> 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!

Same here, and thank you!

							Thanx, Paul