Message ID | 20210701105202.7b196b68@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=/0/B=LZ=lists.freedesktop.org=dri-devel-bounces@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22810C11F66 for <dri-devel@archiver.kernel.org>; Thu, 1 Jul 2021 00:52:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 324C961424 for <dri-devel@archiver.kernel.org>; Thu, 1 Jul 2021 00:52:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 324C961424 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E6226EAA4; Thu, 1 Jul 2021 00:52:09 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 733066EAA4 for <dri-devel@lists.freedesktop.org>; Thu, 1 Jul 2021 00:52:08 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4GFfn06TsLz9sWX; Thu, 1 Jul 2021 10:52:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1625100726; bh=vBawSk9xFZNGIsWWYfV1txmbn3bh40tDg1X6Pjsy0j0=; h=Date:From:To:Cc:Subject:From; b=CMYnOv8oHQl/wUFiGoCpPeS1egCVvcVGdvtkLNcXiBuxIduLX8ebacxwiSljTZpGc ItykRWSAbBhtEOqUp9HcnHf/xDJJ23x2DUizKxhCXQeX9qt4y2mBgqUaVDPWt7NtQY ED3tbtJVstx0zLi9qOg9iS0O5O/0L8TKh4+T8IqCjp5IqIAUJuMd62xjP8AIUXkV/E BCKfYUAJzFCa9QN5qYAzva0cwGLJ1qhwGKUwjUZGGTG2mABgjEXf1u8mIAtllzFscp XGD0w3DUPEIcV6czTNoUqonD7oKyTI5YwpxJAuFpAwdF9o81sfX8xS0bZDKbnjnAFo Z2NrK2B9bEMhQ== Date: Thu, 1 Jul 2021 10:52:02 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20210701105202.7b196b68@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/X3p=+W8Q0B6UxxE/7MsD1pv"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: Philip Yang <Philip.Yang@amd.com>, Felix Kuehling <Felix.Kuehling@amd.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Liam Howlett <liam.howlett@oracle.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Alex Deucher <alexander.deucher@amd.com>, Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org> Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> |
Series |
linux-next: manual merge of the drm tree with Linus' tree
|
expand
|
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 61c4fb1b87fe,6a214a4dfe04..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c