On 07/03/14 15:05, David Herrmann wrote:

If you can take these two patches, that's fine. They're not strictly
needed by the series and I'd be happy to see them upstream. The other
sysfb patches should be merged together, so I don't think there's much
gain in applying them through fbdev.

Ok, I've applied them to fbdev tree.

The DRM tree is usually merged late, anyway, so I'll see whether we
will merge simpledrm through drm-next or not. If not, it'll be 3.16
then. If you can get the fbdev merge in early, that should be enough
for us to figure it out and provide a conflict-resolution. Btw., do
you want the generic sysfb-helper in drivers/video/ or
driver/video/fbdev? It's not limited to fbdev, so I'd put it in
drivers/video/.

With a quick glance, it doesn't seem to depend on fbdev in any way,
right? That makes me think drivers/video/.

 Tomi