Hi Philipp, On Thu, May 04, 2017 at 11:26:18AM +0200, Philipp Zabel wrote: > Hi Sakari, > > On Thu, 2017-05-04 at 10:17 +0300, Sakari Ailus wrote: > > Hi Philipp, > > > > On Thu, May 04, 2017 at 09:07:32AM +0200, Philipp Zabel wrote: > > > On Wed, 2017-05-03 at 22:28 +0300, Sakari Ailus wrote: > > > > Hi Philipp, > > > > > > > > Thanks for continuing working on this! > > > > > > > > I have some minor comments below... > > > > > > Thank you for the comments. > > > > > > [...] > > > > Could you rebase this on the V4L2 fwnode patchset here, please? > > > > > > > > <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi> > > > > > > > > The conversion is rather simple, as shown here: > > > > > > > > <URL:https://git.linuxtv.org/sailus/media_tree.git/commit/?h=v4l2-acpi&id=679035e11bfdbea146fed5d52fb794b34dc9cea6> > > > > > > What is the status of this patchset? Will this be merged soon? > > > > I intend to send a pull request once the next rc1 tag is pulled on > > media-tree master. It depends on patches in linux-pm tree that aren't in > > media-tree yet. > > I get conflicts trying to merge v4l2-acpi into v4.11 or media-tree > master. Could you provide an updated version? What kind of conflicts? I wonder if something somewhere is out of sync. :-) My v4l2-acpi branch is on top of current media-tree master and appears to merge cleanly to v4.11 as well. It still wouldn't compile though as it depends on the fwnode graph patches. I've merged those here: <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi-merge> -- Kind regards, Sakari Ailus e-mail: sakari.ailus@xxxxxx XMPP: sailus@xxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
