On 29.01.24 10:20, Frieder Schrempf wrote: > On 26.01.24 19:28, Dave Airlie wrote: >> Just FYI this conflictted pretty heavily with drm-misc-next changes in >> the same area, someone should check drm-tip has the correct >> resolution, I'm not really sure what is definitely should be. >> >> Dave. > > Thanks! I took a quick look at what is now in Linus' tree and it looks > correct to me. The only thing I'm missing is my Reviewed-by tag which > got lost somewhere, but I can get over that. Apparently I missed the point here. I was looking at the wrong trees (drm-next and master instead of drm-misc-next and drm-tip). Sorry for the noise. Michael already pointed out the correct details.
