Quoting Linus Walleij (2017-12-22 08:35:42) > I haven't even touched drm_syncobj.c so this conflict doesn't appear > to be mine. The conflict looks complex too. > > I guess someone else is busy fixing this up elsewhere in the world so > I just defer for a while and try rebuilding tip later. A function disappeared on one branch and some kerneldoc appeared another branch. Resolved. -Chris _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
