lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 6 Oct 2015 12:09:34 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Dave Airlie <airlied@...ux.ie> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Alex Deucher <alexdeucher@...il.com>, Daniel Vetter <daniel.vetter@...ll.ch> Subject: linux-next: build failure after merge of the drm tree Hi Dave, After merging the drm tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/drm_fb_helper.c: In function 'restore_fbdev_mode': drivers/gpu/drm/drm_fb_helper.c:448:5: error: 'error' undeclared (first use in this function) error = true; ^ Caused by commit 03f9abb28c3e ("drm: handle cursor_set2 in restore_fbdev_mode") >From Linus' tree interacting with commit b7bdf0a87add ("drm/fb-helper: Use -errno return in restore_mode_unlocked") from the drm tree. I added the following merge fix patch: From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Tue, 6 Oct 2015 12:04:49 +1100 Subject: [PATCH] drm/fb-helper: merge fix for "Use -errno return in restore_mode_unlocked" Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au> --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 97d1a4633c5c..bd6d4ab27512 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -445,7 +445,7 @@ static int restore_fbdev_mode(struct drm_fb_helper *fb_helper) if (crtc->funcs->cursor_set2) { ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0); if (ret) - error = true; + return ret; } else if (crtc->funcs->cursor_set) { ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0); if (ret) -- 2.5.1 -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists