Messages in this thread | | | From | Dave Airlie <> | Date | Thu, 9 May 2019 18:23:21 +1000 | Subject | Re: [git pull] drm for 5.2-rc1 |
| |
On Thu, 9 May 2019 at 14:45, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > Dave, > > On Wed, May 8, 2019 at 8:28 PM Dave Airlie <airlied@gmail.com> wrote: > > > > This is the main drm pull request for 5.2. > > Thanks. I've merged it, but I got a couple of conflicts with fixes > (reverts) to mainline in the meantime. > > The one to the i915 driver you seem to have applied again (after the > function was moved and renamed). > > The one to the virtgpu driver, I really don't know if is needed any > more. I suspect I completely unnecessarily merged that > virtgpu_gem_prime_import_sg_table() function that came in because I > decided to do the merge of the revert. > > It's a trivial function that just returns an error, and your tree just > leaves it as NULL, and I suspect my merge doesn't hurt, but it also > probably doesn't matter. > > So you should check my merge.
Thanks,
That explains the "I know I had something else to say" feeling. I did a test merge yesterday and then forgot to write the details down.
I had a look and it seems fine, and it's Gerd's code so if he's happy with the result.
Dave.
| |