Message ID | 20200710122824.3fe55d0c@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=kK3Z=AV=lists.freedesktop.org=dri-devel-bounces@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B24716C1 for <patchwork-dri-devel@patchwork.kernel.org>; Fri, 10 Jul 2020 02:28:35 +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 8AAEF20725 for <patchwork-dri-devel@patchwork.kernel.org>; Fri, 10 Jul 2020 02:28:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="fNBpOMlq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AAEF20725 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 474536EB5C; Fri, 10 Jul 2020 02:28:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 055096EB5C for <dri-devel@lists.freedesktop.org>; Fri, 10 Jul 2020 02:28:30 +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 4B2xmV71xPz9sT6; Fri, 10 Jul 2020 12:28:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594348108; bh=3UhviLMUqD9vkJnzTQoViNLx2PeG7wMUIHUZ6W92kz4=; h=Date:From:To:Cc:Subject:From; b=fNBpOMlqVvVei7QiZfgZbCobi7jQNQp0YVejBN+Qo/7shqN1tkIHok6AoobT160w3 UldU1/qC88VzKixAXIoca0pOpQ0Q4a1x1PHXucDMH12kd7PhP18gtooi0ZuOy1T9l3 coP15P5zrGjxgb2eiOwHLzr+6Q6hwKS3swEHVB46lRwczxxGU9N4PmI0gkkcPEBA2p YKOqcqLbVmNhdQiE+YIlOaM9Ne9EpE6hopk3DJv+JNUxn93lRF2K7v5oR1wm/yJNFS XVd/Fm4k0NmCPUj8GXU4C042h247KQhfb7kr70Gu9VPVjMWL9GrZVqatKMVndRgWbu ZoME1IzD92xbg== Date: Fri, 10 Jul 2020 12:28:24 +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 the drm-fixes tree Message-ID: <20200710122824.3fe55d0c@canb.auug.org.au> MIME-Version: 1.0 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: Alex Deucher <alexander.deucher@amd.com>, Emily Deng <Emily.Deng@amd.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Huang Rui <ray.huang@amd.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Content-Type: multipart/mixed; boundary="===============0153383476==" 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 the drm-fixes tree
|
expand
|
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index ef3269c43d4f,9342a9e8cadf..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c