Re: [git pull] drm next pull for 5.10-rc1
From: Linus Torvalds
Date: Thu Oct 15 2020 - 13:51:47 EST
On Wed, Oct 14, 2020 at 6:33 PM Dave Airlie <airlied@xxxxxxxxx> wrote:
>
> There are a bunch of conflicts but none of them seemed overly scary,
> and sfr has provided resolutions for them all. I've put a tree up with
> my merge results, so you can tell me I did it wrong here:
> https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-next-5.10-merged
Thanks, looks good to me, and I missed the same msm_iommu.c patch you
did, so kudos for pointing that one out too.
Linus