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 -- 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
