* Tony Lindgren <tony@xxxxxxxxxxx> [150603 09:11]: > * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [150603 09:03]: > > > > > > On 03/06/15 18:44, Tony Lindgren wrote: > > > * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [150603 04:28]: > > >> > > >> > > >> On 02/06/15 00:51, Tony Lindgren wrote: > > >>> * Tomi Valkeinen <tomi.valkeinen@xxxxxx> [150531 23:25]: > > >>>> AM57xx Beagle X15 has a HDMI output. This patch adds the device tree > > >>>> nodes required for HDMI. > > >>> > > >>> This one does not seem to apply to linux next, did not look > > >>> further where it conflicts. > > >> > > >> Looks like the change was also in -rc6. I've rebased my patches on -rc6, > > >> and added the acks: > > >> > > >> git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git dra7-dss-arch > > > > > > OK, since there are no other merge conflicts that I'm aware of, > > > it's best that you merge the whole branch. I've acked the patches, > > > so for this one too: > > > > Ok, I can do that, but isn't this more linux-arm stuff? All the driver > > side code is already in the mainline. > > Yes but we're getting so late into merge window that I'd rather not > take it for v4.2 at this point. And it's all DSS related. > > Please make sure you get an ack for the drivers/clk/omap change from > Mike or Stephen though. Naturally I mean "getting so close to the merge window" above :) Regards, Tony -- 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
