On Thu, Mar 06, 2014 at 05:50:30PM +0100, Philipp Zabel wrote: > 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. Unless we can find some way to resolve the problem which just happened (Mauro applied the of-graph as patches to his tree inspite of this discussion), I don't see the imx-drm DT changes being able to be pulled in for the upcoming merge window - because otherwise it means that whatever Mauro has applied your of-graph changes on top of in his tree also gets pulled into my tree and Greg's tree. I'm afraid this has turned into a total shambles, and I'm totally hacked off at Mauro over this. -- 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
