Re: [GIT PULL] fbdev changes for 3.12

2013-09-05 Thread Tomi Valkeinen
On 05/09/13 10:48, David Herrmann wrote: >> There's a conflict in drivers/video/simplefb.c, which you can resolve by >> using >> the version in your tree. > > No, both need to be merged. The current version lacks support for > ABGR. The fbdev tree lacks the DRM format, which should be: > {

Re: [GIT PULL] fbdev changes for 3.12

2013-09-05 Thread Stephen Rothwell
Hi Linus, On Thu, 5 Sep 2013 09:48:18 +0200 David Herrmann wrote: > > On Thu, Sep 5, 2013 at 8:48 AM, Tomi Valkeinen wrote: > > > > Here are the fbdev changes for 3.12. > > > > There's a conflict in drivers/video/simplefb.c, which you can resolve by > > using > > the version in your tree. > >

Re: [GIT PULL] fbdev changes for 3.12

2013-09-05 Thread David Herrmann
Hi Tomi On Thu, Sep 5, 2013 at 8:48 AM, Tomi Valkeinen wrote: > Hi Linus, > > Here are the fbdev changes for 3.12. > > There's a conflict in drivers/video/simplefb.c, which you can resolve by using > the version in your tree. No, both need to be merged. The current version lacks support for ABGR

[GIT PULL] fbdev changes for 3.12

2013-09-04 Thread Tomi Valkeinen
Hi Linus, Here are the fbdev changes for 3.12. There's a conflict in drivers/video/simplefb.c, which you can resolve by using the version in your tree. I guess the simplefb changes were taken through Ingo's tree because the series includes x86 arch changes, but it would have been nice to see the