linux-kernel - linux-next: manual merge of the omap

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130408143623.bbf18647b96df42b8b8ec6a0@canb.auug.org.au>
Date:	Mon, 8 Apr 2013 14:36:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>
Subject: linux-next: manual merge of the omap_dss2 tree with Linus' tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/fbmon.c between commit 477fc03f5baa ("fbmon: use
VESA_DMT_VSYNC_HIGH to fix typo") from Linus' tree and commit
06a3307975aa ("videomode: combine videomode dmt_flags and data_flags")
from the omap_dss2 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/video/fbmon.c
index 7f67099,e5cc2fd..0000000
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@@ -1398,13 -1398,13 +1398,13 @@@ int fb_videomode_from_videomode(const s
  
  	fbmode->sync = 0;
  	fbmode->vmode = 0;
- 	if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
+ 	if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
  		fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
- 	if (vm->dmt_flags & VESA_DMT_VSYNC_HIGH)
 -	if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
++	if (vm->flags & DISPLAY_FLAGS_VSYNC_HIGH)
  		fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
- 	if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
+ 	if (vm->flags & DISPLAY_FLAGS_INTERLACED)
  		fbmode->vmode |= FB_VMODE_INTERLACED;
- 	if (vm->data_flags & DISPLAY_FLAGS_DOUBLESCAN)
+ 	if (vm->flags & DISPLAY_FLAGS_DOUBLESCAN)
  		fbmode->vmode |= FB_VMODE_DOUBLE;
  	fbmode->flag = 0;
  
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped