From: "Christian König" <deathsimple@vodafone.de>
To: Jerome Glisse <j.glisse@gmail.com>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: -next merged with Linus tree
Date: Fri, 20 Jul 2012 16:32:58 +0200 [thread overview]
Message-ID: <50096C1A.8030202@vodafone.de> (raw)
In-Reply-To: <CAH3drwZOmcii4VgD0Z=8G7oqZzN-DeAtQtvob6PkssS=VF580Q@mail.gmail.com>
On 20.07.2012 16:12, Jerome Glisse wrote:
> On Fri, Jul 20, 2012 at 4:47 AM, Christian König
> <deathsimple@vodafone.de> wrote:
>> On 20.07.2012 07:34, Dave Airlie wrote:
>>> Hi,
>>>
>>> I've just merged Linus tree into drm-next and fixes up the conflicts,
>>> some in i915, one in radeon.
>>>
>>> Can you guys check that they look correct after it?
>> Have to test it a bit more, but at least
>> drivers/gpu/drm/radeon/radeon_gart.c looks valid to me on first glance.
>>
>> Christian.
>>
>>
>>> I'll leave it just on my drm-next branch for now.
>>>
>>> Thanks,
>>> Dave.
> Attached patch fix something that have been lost.
Ups, yes indeed. The patch itself is:
Reviewed-by: Christian König <christian.koenig@amd.com>
>
> Cheers,
> Jerome
next prev parent reply other threads:[~2012-07-20 14:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 5:34 -next merged with Linus tree Dave Airlie
2012-07-20 8:47 ` Christian König
2012-07-20 14:12 ` Jerome Glisse
2012-07-20 14:32 ` Christian König [this message]
2012-07-20 15:05 ` Jerome Glisse
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=50096C1A.8030202@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=j.glisse@gmail.com \
/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