Re: big conflict in drm-tip (amdgpu)

2019-03-01 Thread Alex Deucher
On Thu, Feb 28, 2019 at 12:43 PM Chris Wilson wrote: > > Quoting Alex Deucher (2019-02-28 17:25:41) > > On Thu, Feb 28, 2019 at 4:54 AM Chris Wilson > > wrote: > > > > > > Quoting Daniel Vetter (2019-02-28 09:49:51) > > > > On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie wrote: > > > > > > > > > >

Re: big conflict in drm-tip (amdgpu)

2019-02-28 Thread Chris Wilson
Quoting Alex Deucher (2019-02-28 17:25:41) > On Thu, Feb 28, 2019 at 4:54 AM Chris Wilson wrote: > > > > Quoting Daniel Vetter (2019-02-28 09:49:51) > > > On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie wrote: > > > > > > > > I merged some fixes into drm-fixes, pushed it out, then saw tip > > > > bre

Re: big conflict in drm-tip (amdgpu)

2019-02-28 Thread Alex Deucher
On Thu, Feb 28, 2019 at 4:54 AM Chris Wilson wrote: > > Quoting Daniel Vetter (2019-02-28 09:49:51) > > On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie wrote: > > > > > > I merged some fixes into drm-fixes, pushed it out, then saw tip > > > breaking, but I'm needed elsewhere, so if anyone can fix tip

Re: big conflict in drm-tip (amdgpu)

2019-02-28 Thread Chris Wilson
Quoting Daniel Vetter (2019-02-28 09:49:51) > On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie wrote: > > > > I merged some fixes into drm-fixes, pushed it out, then saw tip > > breaking, but I'm needed elsewhere, so if anyone can fix tip up or > > tell me why I got a super messy commit, I'll owe you.

Re: big conflict in drm-tip (amdgpu)

2019-02-28 Thread Daniel Vetter
On Thu, Feb 28, 2019 at 5:30 AM Dave Airlie wrote: > > I merged some fixes into drm-fixes, pushed it out, then saw tip > breaking, but I'm needed elsewhere, so if anyone can fix tip up or > tell me why I got a super messy commit, I'll owe you. Chris already patched it up it seems, I guess someone

big conflict in drm-tip (amdgpu)

2019-02-27 Thread Dave Airlie
I merged some fixes into drm-fixes, pushed it out, then saw tip breaking, but I'm needed elsewhere, so if anyone can fix tip up or tell me why I got a super messy commit, I'll owe you. Thanks, Dave. ___ dri-devel mailing list dri-devel@lists.freedesktop.