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] [day] [month] [year] [list]

Date:	Wed, 21 Sep 2011 09:13:30 +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,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the arm
 tree

On Wed, 2011-09-21 at 13:02 +1000, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c
> drivers/video/omap/lcd_overo.c between commit 1bc857f700fb ("ARM: gpio:
> omap: convert drivers to use asm/gpio.h rather than mach/gpio.h") from
> the arm tree and commits db3136b14a2b ("OMAPFB: Remove unused lcd
> drivers") and 0cde58449424 ("OMAPDSS: Port the Apollon display driver to
> DSS2") from the omap_dss2 tree.
> 
> The latter two commist removed these files, so I did that.

Thanks, this is also correct.

 Tomi


--
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/