* [GIT PULL] fbdev fixes for 3.15
@ 2014-04-16 9:03 Tomi Valkeinen
2014-04-16 23:04 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Tomi Valkeinen @ 2014-04-16 9:03 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]
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(-)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] fbdev fixes for 3.15
2014-04-16 9:03 [GIT PULL] fbdev fixes for 3.15 Tomi Valkeinen
@ 2014-04-16 23:04 ` Linus Torvalds
2014-04-17 3:24 ` Stephen Rothwell
2014-04-17 7:08 ` Tomi Valkeinen
0 siblings, 2 replies; 4+ messages in thread
From: Linus Torvalds @ 2014-04-16 23:04 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-kernel, linux-fbdev
On Wed, Apr 16, 2014 at 2:03 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] fbdev fixes for 3.15
2014-04-16 23:04 ` Linus Torvalds
@ 2014-04-17 3:24 ` Stephen Rothwell
2014-04-17 7:08 ` Tomi Valkeinen
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-04-17 3:24 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Tomi Valkeinen, linux-kernel, linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
On Wed, 16 Apr 2014 16:04:39 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Wed, Apr 16, 2014 at 2:03 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
> >
> > 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 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] fbdev fixes for 3.15
2014-04-16 23:04 ` Linus Torvalds
2014-04-17 3:24 ` Stephen Rothwell
@ 2014-04-17 7:08 ` Tomi Valkeinen
1 sibling, 0 replies; 4+ messages in thread
From: Tomi Valkeinen @ 2014-04-17 7:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-fbdev, Stephen Rothwell
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
On 17/04/14 02:04, Linus Torvalds wrote:
> On Wed, Apr 16, 2014 at 2:03 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote:
>>
>> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-17 7:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-16 9:03 [GIT PULL] fbdev fixes for 3.15 Tomi Valkeinen
2014-04-16 23:04 ` Linus Torvalds
2014-04-17 3:24 ` Stephen Rothwell
2014-04-17 7:08 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).