linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5163E925.4060601@ti.com>
Date:	Tue, 9 Apr 2013 13:10:45 +0300
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Jingoo Han <jg1.han@...sung.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree

Hi,

On 2013-04-08 07:36, Stephen Rothwell wrote:
> 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;

Thanks, looks correct.

I wonder what I should do about this conflict. Both the fix in Linus'
tree and the new code come from fbdev tree (I'm currently handling fbdev
patches), and it feels a bit silly to have conflicts between the fixes
and new commits from the same subsystem tree.

I could just leave the conflict be, or I could merge the fix into the
fbdev-next branch. Do you know if there's a rule of thumb I should
follow here?

 Tomi



Download attachment "signature.asc" of type "application/pgp-signature" (900 bytes)