linux-kernel - Re: linux-next: manual merge of the omap_dss2 tree with the fbdev-current tree

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20110419070114.GA7582@linux-sh.org>
Date:	Tue, 19 Apr 2011 16:01:14 +0900
From:	Paul Mundt <lethal@...ux-sh.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Tomi Valkeinen <tomi.valkeinen@...com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Archit Taneja <archit@...com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the fbdev-current tree

On Tue, Apr 19, 2011 at 01:27:20PM +1000, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/dss/dss_features.c
> drivers/video/omap2/dss/dss_features.h between commit 0b41136c0d2f
> ("OMAP: DSS2: DSI: Fix DSI PLL power bug") from the fbdev-current tree
> and commit 0f7d043bd56b ("OMAP4: DSS2: Register configuration changes for
> DSI") from the omap_dss2 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Hmm, both changes came from the omap_dss2 tree, I wonder what's going on?
--
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/