From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mundt <lethal@linux-sh.org>,
Grant Likely <grant.likely@secretlab.ca>,
linux-kernel@vger.kernel.org, Heiko Schocher <hs@denx.de>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the 52xx-and-virtex tree with Linus' tree
Date: Tue, 3 May 2011 07:19:34 -0600 [thread overview]
Message-ID: <BANLkTikOBGCu70NrsFAa42w5M6O+dkHZnw@mail.gmail.com> (raw)
In-Reply-To: <BANLkTik=LX8RQEh1ouhSdFxUH+2oro9J6w@mail.gmail.com>
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.
prev parent reply other threads:[~2011-05-03 13:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTikOBGCu70NrsFAa42w5M6O+dkHZnw@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=hs@denx.de \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).