Re: [git pull] drm for 5.2-rc1

2019-05-09 Thread Dave Airlie
On Thu, 9 May 2019 at 14:45, Linus Torvalds wrote: > > Dave, > > On Wed, May 8, 2019 at 8:28 PM Dave Airlie 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

Re: [git pull] drm for 5.2-rc1

2019-05-09 Thread Gerd Hoffmann
Hi, > 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 erro

Re: [git pull] drm for 5.2-rc1

2019-05-08 Thread Linus Torvalds
Dave, On Wed, May 8, 2019 at 8:28 PM Dave Airlie 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 move

Re: [git pull] drm for 5.2-rc1

2019-05-08 Thread pr-tracker-bot
The pull request you sent on Thu, 9 May 2019 13:28:07 +1000: > git://anongit.freedesktop.org/drm/drm tags/drm-next-2019-05-09 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/a2d635decbfa9c1e4ae15cb05b68b2559f7f827c Thank you! -- Deet-doot-dot, I am a bot. https://kor