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

Message-Id: <20110218131938.d7b27a31.sfr@canb.auug.org.au>
Date:	Fri, 18 Feb 2011 13:19:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...ia.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Benoit Cousson <b-cousson@...com>,
	Mayuresh Janorkar <mayur@...com>,
	Senthilvadivu Guruswamy <svadivu@...com>,
	Sumit Semwal <sumit.semwal@...com>
Subject: linux-next: manual merge of the omap_dss2 tree with the  tree

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit
d63bd74fbb5fb2161d9cb90cd7a93a2c5db47c63 ("OMAP4: hwmod data: Add DSS,
DISPC, DSI1&2, RFBI, HDMI and VENC") from the omap tree and commit
cb93d0b00acd5e5ada8ddd4c8719d4aa390515d2 ("OMAP4: hwmod data: add DSS
DISPC DSI1,2 RFBI HDMI VENC") from the omap_dss2 tree.

So these two commits with essentially the same commit messages and author
dates are quite different :-(.  I used the version from the omap tree.
Please sort this out.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped