On Fri, Sep 20, 2019 at 2:11 AM Dave Airlie wrote:
> > Hmm. My merge isn't identical to that. It's close though. Different
> > order for one #define which might be just from you and me merging
> > different directions.
> >
> > But I also ended up removing the .gem_prime_export initialization to
>
On Fri, Sep 20, 2019 at 9:11 AM Dave Airlie wrote:
>
> > Hmm. My merge isn't identical to that. It's close though. Different
> > order for one #define which might be just from you and me merging
> > different directions.
> >
> > But I also ended up removing the .gem_prime_export initialization to
> Hmm. My merge isn't identical to that. It's close though. Different
> order for one #define which might be just from you and me merging
> different directions.
>
> But I also ended up removing the .gem_prime_export initialization to
> drm_gem_prime_export, because it's the default if none exists.
The pull request you sent on Fri, 20 Sep 2019 05:08:55 +1000:
> git://anongit.freedesktop.org/drm/drm tags/drm-next-2019-09-18
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/574cc4539762561d96b456dbc0544d8898bd4c6e
Thank you!
--
Deet-doot-dot, I am a bot.
https://ko
On Thu, Sep 19, 2019 at 12:09 PM Dave Airlie wrote:
>
> There are a few merge conflicts across the board, we have a shared
> rerere cache which meant I hadn't noticed them until I avoided the
> cache.
> https://cgit.freedesktop.org/drm/drm/log/?h=drm-5.4-merge
> contains what we've done, none of t
