On Fri, Mar 07, 2014 at 09:20:31AM -0300, Mauro Carvalho Chehab wrote: > Em Fri, 07 Mar 2014 11:55:17 +0000 > Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> 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. Thank you, that will work much better, and will avoid flames from Linus at the next merge window. -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
