From: Mauro Carvalho Chehab <m.chehab@samsung.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Philipp Zabel <p.zabel@pengutronix.de>,
Grant Likely <grant.likely@linaro.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
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,
Sylwester Nawrocki <s.nawrocki@samsung.com>
Subject: Re: [GIT PULL] Move device tree graph parsing helpers to drivers/of
Date: Fri, 07 Mar 2014 09:20:31 -0300 [thread overview]
Message-ID: <20140307092031.68cd985d@samsung.com> (raw)
In-Reply-To: <20140307115517.GI21483@n2100.arm.linux.org.uk>
Em Fri, 07 Mar 2014 11:55:17 +0000
Russell King - ARM Linux <linux@arm.linux.org.uk> 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
next prev parent reply other threads:[~2014-03-07 12:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-06 17:13 [GIT PULL] Move device tree graph parsing helpers to drivers/of Philipp Zabel
[not found] ` < 20140307182330.75168C40AE3@trevor.secretlab.ca>
2014-03-07 11:55 ` Russell King - ARM Linux
2014-03-07 12:20 ` Mauro Carvalho Chehab [this message]
2014-03-07 13:29 ` Russell King - ARM Linux
2014-03-07 18:23 ` Grant Likely
2014-03-10 13:26 ` Mauro Carvalho Chehab
2014-03-10 14:37 ` Grant Likely
[not found] ` <1394708896. 3577.21.camel@paszta.hi.pengutronix.de>
2014-03-11 11:12 ` Mauro Carvalho Chehab
2014-03-13 11:08 ` Philipp Zabel
2014-03-13 11:35 ` Russell King - ARM Linux
2014-03-13 15:13 ` Sylwester Nawrocki
2014-03-13 15:37 ` Sylwester Nawrocki
2014-03-14 7:05 ` Robert Schwebel
2014-03-17 23:30 ` Laurent Pinchart
2014-03-18 6:27 ` Tomi Valkeinen
2014-03-20 16:03 ` Grant Likely
2014-03-13 17:13 ` Laurent Pinchart
2014-03-14 12:19 ` Philipp Zabel
2014-03-14 12:44 ` Tomi Valkeinen
2014-03-17 23:41 ` Laurent Pinchart
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=20140307092031.68cd985d@samsung.com \
--to=m.chehab@samsung.com \
--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=p.zabel@pengutronix.de \
--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