From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: [GIT PULL] Move device tree graph parsing helpers to drivers/of Date: Fri, 07 Mar 2014 09:20:31 -0300 Message-ID: <20140307092031.68cd985d@samsung.com> References: <1394126000.3622.66.camel@paszta.hi.pengutronix.de> <20140307115517.GI21483@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-reply-to: <20140307115517.GI21483@n2100.arm.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org To: Russell King - ARM Linux Cc: Philipp Zabel , Grant Likely , Tomi Valkeinen , Guennadi Liakhovetski , Rob Herring , Laurent Pinchart , Kyungmin Park , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, Sylwester Nawrocki List-Id: devicetree@vger.kernel.org Em Fri, 07 Mar 2014 11:55:17 +0000 Russell King - ARM Linux escreveu: > On Thu, Mar 06, 2014 at 06:13:20PM +0100, Philipp Zabel wrote: > > Hi Mauro, Russell, > > > > I have temporarily removed the simplified bindings at Sylwester's > > request and updated the branch with the acks. The following changes > > since commit 0414855fdc4a40da05221fc6062cccbc0c30f169: > > > > Linux 3.14-rc5 (2014-03-02 18:56:16 -0800) > > > > are available in the git repository at: > > > > git://git.pengutronix.de/git/pza/linux.git topic/of-graph > > Okay, this has all gone wrong. Mauro has applied your changes as patches, > and I've pulled this set of changes. So we're going to be all set for > merge conflicts....... just fscking great. > > I really don't know why I bother trying to do the right thing sometimes. > I just reverted my tree to the previous state before applying the patches and did a git pull instead, in order to avoid merge conflicts when the imx-drm patches arrive via staging tree. Regards, Mauro