lkml.org 
[lkml]   [2011]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-05-03 03:47    [W:0.030 / U:2.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site