Skip to contentSkip to conversation

fbdev fixes for 3.15

GIT PULL Tomi Valkeinen 3 participants 4 messages Apr 16, 2014 – Apr 17, 2014 Framebuffer layer

lore
Share & tools
lore

Tomi Valkeinen

author
#0 lore raw

Hi Linus,

Please pull fbdev fixes for 3.15.

The drivers/video/Kconfig change in this pull request will conflict with the fbdev reorder series, which is not yet in your tree. If that's an issue, I can resend this without the Kconfig change.

Tomi

The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/fbdev-fixes-3.15

for you to fetch changes up to c26ef3eb3c11274bad1b64498d0a134f85755250:

video: bf54x-lq043fb: fix build error (2014-04-15 12:44:16 +0300)

----------------------------------------------------------------
fbdev fixes for 3.15:

- fix build errors for bf54x-lq043fb and imxfb
- fbcon fix for da8xx-fb
- omapdss fixes for hdmi audio, irq handling and fclk calculation

----------------------------------------------------------------
Alexander Shiyan (1):
video: imxfb: Select LCD_CLASS_DEVICE unconditionally

Jon Ringle (1):

      video: da8xx-fb: Fix casting of info->pseudo_palette

Jyri Sarha (2):
OMAPDSS: Take pixelclock unit change into account in hdmi_compute_acr()
OMAPDSS: Change struct reg_field to dispc_reg_field

Steven Miao (1):
video: bf54x-lq043fb: fix build error

Tomi Valkeinen (2):
OMAPDSS: fix rounding when calculating fclk rate
OMAPDSS: fix shared irq handlers

 drivers/video/Kconfig                 |  2 ++
 drivers/video/bf54x-lq043fb.c         |  2 +-
 drivers/video/da8xx-fb.c              | 10 +-----
 drivers/video/omap2/dss/dispc.c       | 67 +++++++++++++++++++++++++++++------
 drivers/video/omap2/dss/dsi.c         | 20 +++++++++++
 drivers/video/omap2/dss/dss.c         |  4 +--
 drivers/video/omap2/dss/dss.h         |  6 ----
 drivers/video/omap2/dss/hdmi_common.c |  8 ++---
 8 files changed, 87 insertions(+), 32 deletions(-)
#1 lore raw
Quoted 4 lines · Tomi Valkeinen

The drivers/video/Kconfig change in this pull request will conflict with the fbdev reorder series, which is not yet in your tree. If that's an issue, I can resend this without the Kconfig change.

I was actually hoping/expecting you to just resend the renaming rebased on top of 3.15-rc1. Or maybe you could do it on top of this.

Linus

#2 lore raw
Quoted 9 lines · On Wed, 16 Apr 2014 16:04:39 -0700 Linus Torvalds…
Quoted 4 lines · Tomi Valkeinen

The drivers/video/Kconfig change in this pull request will conflict with the fbdev reorder series, which is not yet in your tree. If that's an issue, I can resend this without the Kconfig change.

I was actually hoping/expecting you to just resend the renaming rebased on top of 3.15-rc1. Or maybe you could do it on top of this.

Yeah, I was kind of hoping that this movement of files would be done with sooner rather than later ...

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
author
#3 lore raw
In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds
Quoted 4 lines · Tomi Valkeinen

The drivers/video/Kconfig change in this pull request will conflict with the fbdev reorder series, which is not yet in your tree. If that's an issue, I can resend this without the Kconfig change.

I was actually hoping/expecting you to just resend the renaming rebased on top of 3.15-rc1. Or maybe you could do it on top of this.

Oh, sorry. I somehow got the impression that you were fine with what I had sent, and you'll just merge it after -rc1.

I'll send a rebased version, based on fbdev-fixes-3.15. So pull this one first.

Tomi