From: Oded Gabbay <oded.gabbay@amd.com>
To: Dave Airlie <airlied@gmail.com>,
dri-devel <dri-devel@lists.freedesktop.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: conflicts in amdkfd between -next and -fixes
Date: Thu, 29 Jan 2015 10:14:34 +0200 [thread overview]
Message-ID: <54C9EBEA.9090409@amd.com> (raw)
In-Reply-To: <CAPM=9txqSVhuvqVtc7uTDQgvK8SAWtUhvKt1fzDuv-iZhWCOnQ@mail.gmail.com>
On 01/29/2015 03:49 AM, Dave Airlie wrote:
> Hey Oded,
>
> so I pulled -fixes into -next this morning and made amdkfd build
> again, it had a few conflicts in it,
>
> I've pushed a drm-next branch with the conflicts resolved and amdkfd
> that builds, the only one I'm a bit scared on was the size calculation
> fixup for the removal of the max processes.
>
> can you please look at the drm-next and see if it breaks anything.
>
> Dave.
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Hi Dave,
I looked at drm-next and your merge is perfect. thanks!
However, I noticed two minor bugs so this pass on the code was even more
beneficial :)
I'll send fixes shortly.
Oded
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2015-01-29 8:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 1:49 conflicts in amdkfd between -next and -fixes Dave Airlie
2015-01-29 6:18 ` Oded Gabbay
2015-01-29 8:14 ` Oded Gabbay [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=54C9EBEA.9090409@amd.com \
--to=oded.gabbay@amd.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.