From: Philipp Zabel <p.zabel@pengutronix.de>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
devicetree@vger.kernel.org
Subject: Re: [PATCH v6 0/8] Move device tree graph parsing helpers to drivers/of
Date: Thu, 06 Mar 2014 17:50:30 +0100 [thread overview]
Message-ID: <1394124630.3622.64.camel@paszta.hi.pengutronix.de> (raw)
In-Reply-To: <5318A331.2070603@samsung.com>
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
next prev parent reply other threads:[~2014-03-06 16:50 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 9:20 [PATCH v6 0/8] Move device tree graph parsing helpers to drivers/of Philipp Zabel
[not found] ` < 20140306152414.GC21483@n2100.arm.linux.org.uk>
2014-03-05 9:20 ` [PATCH v6 1/8] [media] of: move graph helpers from drivers/media/v4l2-core " Philipp Zabel
2014-03-07 18:25 ` Grant Likely
2014-03-05 9:20 ` [PATCH v6 4/8] of: Reduce indentation in of_graph_get_next_endpoint Philipp Zabel
2014-03-07 0:12 ` Laurent Pinchart
2014-03-07 17:40 ` Philipp Zabel
[not found] ` <1394214054.16309.45.camel-+qGW7pzALmz7o/J7KWpOmN53zsg1cpMQ@public.gmane.org>
2014-03-10 19:19 ` Laurent Pinchart
2014-03-11 11:06 ` Philipp Zabel
2014-03-07 18:30 ` Grant Likely
2014-03-05 9:20 ` [PATCH v6 6/8] of: Implement simplified graph binding for single port devices Philipp Zabel
2014-03-07 18:38 ` Grant Likely
2014-03-09 19:21 ` Philipp Zabel
[not found] ` <1394011242-16783-1-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-03-05 9:20 ` [PATCH v6 2/8] Documentation: of: Document graph bindings Philipp Zabel
2014-03-07 18:27 ` Grant Likely
2014-03-10 9:28 ` Philipp Zabel
[not found] ` <1394443690.7380.10.camel-+qGW7pzALmz7o/J7KWpOmN53zsg1cpMQ@public.gmane.org>
2014-03-10 11:37 ` Laurent Pinchart
2014-03-10 13:57 ` Philipp Zabel
2014-03-05 9:20 ` [PATCH v6 3/8] of: Warn if of_graph_get_next_endpoint is called with the root node Philipp Zabel
2014-03-07 18:28 ` Grant Likely
2014-03-05 9:20 ` [PATCH v6 5/8] [media] of: move common endpoint parsing to drivers/of Philipp Zabel
2014-03-05 9:20 ` [PATCH v6 7/8] of: Document simplified graph binding for single port devices Philipp Zabel
2014-03-05 9:20 ` [PATCH v6 8/8] of: Warn if of_graph_parse_endpoint is called with the root node Philipp Zabel
2014-03-05 11:35 ` [PATCH v6 0/8] Move device tree graph parsing helpers to drivers/of Tomi Valkeinen
2014-03-05 14:42 ` Philipp Zabel
2014-03-06 14:16 ` Russell King - ARM Linux
[not found] ` <20140306141657.GB21483-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-03-06 15:17 ` Mauro Carvalho Chehab
[not found] ` <20140306121721.6186dafb-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2014-03-06 15:47 ` Sylwester Nawrocki
2014-03-06 16:21 ` Philipp Zabel
[not found] ` <1394122879.3622.47.camel-+qGW7pzALmz7o/J7KWpOmN53zsg1cpMQ@public.gmane.org>
2014-03-06 16:32 ` Sylwester Nawrocki
2014-03-06 16:50 ` Philipp Zabel [this message]
2014-03-07 12:06 ` Russell King - ARM Linux
2014-03-07 0:16 ` Laurent Pinchart
2014-03-07 18:41 ` Grant Likely
2014-03-06 15:24 ` Russell King - ARM Linux
2014-03-06 15:39 ` Philipp Zabel
2014-03-06 15:50 ` Russell King - ARM Linux
[not found] ` <20140306155018.GD21483-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-03-07 18:49 ` Grant Likely
[not found] ` < 1394011242-16783-6-git-send-email-p.zabel@pengutronix.de>
[not found] ` <1394011242-16783-6-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-03-07 18:32 ` [PATCH v6 5/8] [media] of: move common endpoint parsing " Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394124630.3622.64.camel@paszta.hi.pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=g.liakhovetski@gmx.de \
--cc=grant.likely@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=m.chehab@samsung.com \
--cc=robh+dt@kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).