* linux-next: manual merge of the 52xx-and-virtex tree with Linus' tree
@ 2011-05-03 1:43 Stephen Rothwell
[not found] ` <BANLkTik=LX8RQEh1ouhSdFxUH+2oro9J6w@mail.gmail.com>
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-05-03 1:43 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Heiko Schocher, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the 52xx-and-virtex tree with Linus' tree
[not found] ` <BANLkTik=LX8RQEh1ouhSdFxUH+2oro9J6w@mail.gmail.com>
@ 2011-05-03 13:19 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2011-05-03 13:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul Mundt, Grant Likely, linux-kernel, Heiko Schocher,
linux-next
On Mon, May 2, 2011 at 11:49 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
>
> On May 2, 2011 7:43 PM, "Stephen Rothwell" <sfr@canb.auug.org.au> wrote:
>>
>> 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.
>
> Okay, I'll probably drop those patches from my tree then... I'll investigate
> tomorrow.
Ah, I missed that Paul had picked them up. Dropping from my tree.
g.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-03 13:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-03 1:43 linux-next: manual merge of the 52xx-and-virtex tree with Linus' tree Stephen Rothwell
[not found] ` <BANLkTik=LX8RQEh1ouhSdFxUH+2oro9J6w@mail.gmail.com>
2011-05-03 13:19 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).