Re: [git pull] drm for 5.13-rc1

On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie airlied@gmail.com wrote:

There aren't a massive amount of conflicts, only with vmwgfx when I did a test merge into your master yesterday, I think you should be able to handle them yourself, but let me know if you want me to push a merged tree somewhere (or if I missed something).

The conflict was easy enough to resolve, but was unusual in that my tree had vmwgfx fixes that weren't in the development tree (ie that commit 2ef4fb92363c: "drm/vmwgfx: Make sure bo's are unpinned before putting them back").

Usually when I merge stuff, I can see that the fixes that were pushed to my tree are also in the development branch. Not so this time.

Linus