Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <CAPM=9txyMmW1DWhS--SuYQu4qDK1GPzgHJwxbAfhHT=hUsPODA@mail.gmail.com>
In-Reply-To: <CAPM=9txyMmW1DWhS--SuYQu4qDK1GPzgHJwxbAfhHT=hUsPODA@mail.gmail.com>
From:   Dave Airlie <airlied@gmail.com>
Date:   Thu, 15 Oct 2020 12:58:26 +1000
Message-ID: <CAPM=9tzyZ3sxM4K40+dpm-eL=+QyN6RTj3HaJgD=HU5MCiKqjg@mail.gmail.com>
Subject: Re: [git pull] drm next pull for 5.10-rc1
To:     Linus Torvalds <torvalds@linux-foundation.org>,
        Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     dri-devel <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, 15 Oct 2020 at 11:33, Dave Airlie <airlied@gmail.com> wrote:
>
> Hi Linus,
>
> This is the main drm pull request for 5.10.
>
> Not a major amount of change, the i915 trees got split into display
> and gt trees to better facilitate higher level review, and there's a
> major refactoring of i915 GEM locking to use more core kernel concepts
> (like ww-mutexes). msm gets per-process pagetables, older AMD SI cards
> get DC support, nouveau got a bump in displayport support with common
> code extraction from i915.
>
> 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

Apparently I lied, and I only built my merged tree on x86

https://lore.kernel.org/dri-devel/20201015134357.0a4e61b3@canb.auug.org.au/T/#t

Please apply the patch from this thread once you merge my tree.

Dave.