linux-kernel - linux-next: manual merge of the 52xx-and-virtex tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20110503114353.30d1f949.sfr@canb.auug.org.au>
Date:	Tue, 3 May 2011 11:43:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Heiko Schocher <hs@...x.de>, Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the 52xx-and-virtex tree with Linus'
 tree

Hi Grant,

Today's linux-next merge of the 52xx-and-virtex tree got a conflict in
drivers/video/sm501fb.c between commit e6a049807105 ("video, sm501: add
edid and commandline support") from Linus' tree and commit b6c19191c13e
("video/sm501: add edid and commandline support") from the
52xx-and-virtex tree.

These are slightly different versions of the same patch.  I used the
version from the 52xx-and-virtex tree (that removed a use of
__devinitdata).

Also, another between commit 4295f9bf74a8 ("video, sm501: add OF binding
to support SM501") from Linus' tree and commit 9d83d245a352
("video/sm501: add OF binding to support SM501") from the 52xx-and-virtex
tree.

Again, different versions of the same patch.  The former has a whole hunk
that appears to fix a memory leak.  So I used that.

I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped