From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philipp Zabel Subject: Re: [PATCH v6 0/8] Move device tree graph parsing helpers to drivers/of Date: Thu, 06 Mar 2014 17:50:30 +0100 Message-ID: <1394124630.3622.64.camel@paszta.hi.pengutronix.de> References: <1394011242-16783-1-git-send-email-p.zabel@pengutronix.de> <53170C00.20200@ti.com> <1394030554.8754.31.camel@paszta.hi.pengutronix.de> <20140306141657.GB21483@n2100.arm.linux.org.uk> <20140306121721.6186dafb@samsung.com> <5318988C.2030004@samsung.com> <1394122879.3622.47.camel@paszta.hi.pengutronix.de> <5318A331.2070603@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5318A331.2070603@samsung.com> Sender: linux-kernel-owner@vger.kernel.org To: Sylwester Nawrocki Cc: Russell King - ARM Linux , Tomi Valkeinen , Mauro Carvalho Chehab , Guennadi Liakhovetski , Grant Likely , Rob Herring , Laurent Pinchart , Kyungmin Park , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org List-Id: devicetree@vger.kernel.org Am Donnerstag, den 06.03.2014, 17:32 +0100 schrieb Sylwester Nawrocki: > On 06/03/14 17:21, Philipp Zabel wrote: > > Am Donnerstag, den 06.03.2014, 16:47 +0100 schrieb Sylwester Nawrocki: > >> Yes, it's going to conflict with my patch series. I thought it could be > >> put onto a stable a topic branch, e.g. at git://linuxtv.org/media_tree.git, > >> which could be then pulled into the media master branch and anywhere > >> else it is needed ? > > > > Mauro, are you ok with handling the conflict in the merge, or should I > > rebase on top of the media tree after you merged Sylwester's changes? > > I could rebase and resolve any conflicts before sending my pull request > to Mauro. I don't think it's a good idea to rebase this series onto the > media tree, since it is touching drivers/of. Excellent, thanks. I will send a pull request to Mauro and Russell shortly. regards Philipp