Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755919AbaG3Wgb (ORCPT ); Wed, 30 Jul 2014 18:36:31 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:57793 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755847AbaG3Wg3 (ORCPT ); Wed, 30 Jul 2014 18:36:29 -0400 X-Sasl-enc: 3p+hJZJTXlO6JKD/gEB4QBuZEh4FHEXTR8yuUctIsUZP 1406759787 Date: Wed, 30 Jul 2014 15:35:59 -0700 From: Greg KH To: Stephen Rothwell Cc: Mike Turquette , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sylwester Nawrocki , Kim Phillips Subject: Re: linux-next: manual merge of the clk tree with the driver-core tree Message-ID: <20140730223559.GB9004@kroah.com> References: <20140730185708.12a99f00@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140730185708.12a99f00@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 30, 2014 at 06:57:08PM +1000, Stephen Rothwell wrote: > Hi Mike, > > Today's linux-next merge of the clk tree got a conflict in > drivers/base/platform.c between commit 3d713e0e382e ("driver core: > platform: add device binding path 'driver_override'") from the > driver-core tree and commit 86be408bfbd8 ("clk: Support for clock > parents and rates assigned from device tree") from the clk tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/