Re: Not 100% sure if I correctly fixed drm-tip

2021-02-12 Thread Christian König
Am 12.02.21 um 09:27 schrieb Daniel Vetter: On Fri, Feb 12, 2021 at 08:51:19AM +0100, Christian König wrote: Am 11.02.21 um 18:22 schrieb Daniel Vetter: On Thu, Feb 11, 2021 at 4:27 PM Christian König wrote: Am 11.02.21 um 16:02 schrieb Jani Nikula: On Thu, 11 Feb 2021, Christian König

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-12 Thread Daniel Vetter
On Fri, Feb 12, 2021 at 08:51:19AM +0100, Christian König wrote: > > > Am 11.02.21 um 18:22 schrieb Daniel Vetter: > > On Thu, Feb 11, 2021 at 4:27 PM Christian König > > wrote: > > > > > > > > > Am 11.02.21 um 16:02 schrieb Jani Nikula: > > > > On Thu, 11 Feb 2021, Christian König wrote: > >

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Christian König
Am 11.02.21 um 18:22 schrieb Daniel Vetter: On Thu, Feb 11, 2021 at 4:27 PM Christian König wrote: Am 11.02.21 um 16:02 schrieb Jani Nikula: On Thu, 11 Feb 2021, Christian König wrote: Hi guys, I had a conflict this morning in the ttm pool while pushing an important fix to drm-misc-fixe

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Daniel Vetter
On Thu, Feb 11, 2021 at 4:27 PM Christian König wrote: > > > > Am 11.02.21 um 16:02 schrieb Jani Nikula: > > On Thu, 11 Feb 2021, Christian König wrote: > >> Hi guys, > >> > >> I had a conflict this morning in the ttm pool while pushing an important > >> fix to drm-misc-fixes. > >> > >> I'm not 1

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Christian König
Am 11.02.21 um 16:02 schrieb Jani Nikula: On Thu, 11 Feb 2021, Christian König wrote: Hi guys, I had a conflict this morning in the ttm pool while pushing an important fix to drm-misc-fixes. I'm not 100% sure if I correctly fixed up drm-tip. How can this be double checked? And how can it be

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Jani Nikula
On Thu, 11 Feb 2021, Christian König wrote: > Hi guys, > > I had a conflict this morning in the ttm pool while pushing an important > fix to drm-misc-fixes. > > I'm not 100% sure if I correctly fixed up drm-tip. How can this be > double checked? And how can it be fixed if the merge has gone bad?

Re: Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Thomas Zimmermann
(cc'ing Jani) Am 11.02.21 um 11:01 schrieb Christian König: Hi guys, I had a conflict this morning in the ttm pool while pushing an important fix to drm-misc-fixes. I'm not 100% sure if I correctly fixed up drm-tip. How can this be double checked? And how can it be fixed if the merge has go

Not 100% sure if I correctly fixed drm-tip

2021-02-11 Thread Christian König
Hi guys, I had a conflict this morning in the ttm pool while pushing an important fix to drm-misc-fixes. I'm not 100% sure if I correctly fixed up drm-tip. How can this be double checked? And how can it be fixed if the merge has gone bad? Thanks, Christian. _