The patch titled fbdev: fix Sharp UXGA checking has been added to the -mm tree. Its filename is fbdev-add-ultrasharp-uxga-to-broken-monitor-database-fix.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fbdev: fix Sharp UXGA checking From: "Antonino A. Daplas" <adaplas@xxxxxxxxx> If the Ultrasharp UXGA is detected, the check function returns a nonzero value. It should return the type of fix instead. Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx> Cc: James Simmons <jsimmons@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/fbmon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/video/fbmon.c~fbdev-add-ultrasharp-uxga-to-broken-monitor-database-fix drivers/video/fbmon.c --- a/drivers/video/fbmon.c~fbdev-add-ultrasharp-uxga-to-broken-monitor-database-fix +++ a/drivers/video/fbmon.c @@ -183,10 +183,11 @@ static int check_edid(unsigned char *edi break; case FBMON_FIX_TIMINGS: b = edid + DETAILED_TIMING_DESCRIPTIONS_START; + ret = fix; for (i = 0; i < 4; i++) { if (edid_is_limits_block(b)) { - ret = fix; + ret = 0; break; } _ Patches currently in -mm which might be from adaplas@xxxxxxxxx are origin.patch atyfb-fix-kconfig-error.patch fbdev-add-ultrasharp-uxga-to-broken-monitor-database.patch fbdev-add-ultrasharp-uxga-to-broken-monitor-database-fix.patch intelfb-fix-ring-space-calculation.patch nvidiafb-bring-back-generic-ddc-reading.patch nvidiafb-bring-back-generic-ddc-reading-fix.patch fbdev-ignore-vesa-modes-if-framebuffer-is-disabled.patch fbdev-fix-obvious-bug-in-show_pan.patch neofb-fill-transp-msb_right-with-the-correct.patch atyfb-kill-dead-code.patch fbdev-mm-deferred-io-support.patch fbdev-hecuba-framebuffer-driver.patch fbdev-hecuba-framebuffer-driver-fix.patch nvidiafb-backlight-fix-implicit-declaration-in-nv_backlight.patch atyfb-fix-kconfig-error-part-2.patch fbdev-fix-kconfig-error-if-fb_ddc=n.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html