The pull request you sent on Thu, 30 Jan 2020 15:58:11 +1000:
> git://anongit.freedesktop.org/drm/drm tags/drm-next-2020-01-30
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9f68e3655aae6d49d6ba05dd263f99f33c2567af
Thank you!
--
Deet-doot-dot, I am a bot.
https://ko
Quoting Linus Torvalds (2020-01-30 16:13:24)
> On Wed, Jan 29, 2020 at 9:58 PM Dave Airlie wrote:
> >
> > It has two known conflicts, one in i915_gem_gtt, where you should juat
> > take what's in the pull (it looks messier than it is),
>
> That doesn't seem right. If I do that, I lose the added G
On Thu, Jan 30, 2020 at 8:13 AM Linus Torvalds
wrote:
>
> That doesn't seem right. If I do that, I lose the added GEM_BUG_ON()'s.
Just for your ref: see commit ecc4d2a52df6 ("drm/i915/userptr: fix
size calculation") for the source of those debug statements, and then
2c86e55d2ab5 ("drm/i915/gtt: s
On Wed, Jan 29, 2020 at 9:58 PM Dave Airlie wrote:
>
> It has two known conflicts, one in i915_gem_gtt, where you should juat
> take what's in the pull (it looks messier than it is),
That doesn't seem right. If I do that, I lose the added GEM_BUG_ON()'s.
I think the proper merge resolution does
