Message ID | 20200921130757.6ece7053@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=Z9mv=C6=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 06BF56CB for <patchwork-dri-devel@patchwork.kernel.org>; Mon, 21 Sep 2020 03:08:10 +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 98CE320723 for <patchwork-dri-devel@patchwork.kernel.org>; Mon, 21 Sep 2020 03:08:09 +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="A24X/rF6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98CE320723 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 C7ABF89F24; Mon, 21 Sep 2020 03:08:05 +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 4189789F24 for <dri-devel@lists.freedesktop.org>; Mon, 21 Sep 2020 03:08:04 +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 4BvqBQ05y2z9sSW; Mon, 21 Sep 2020 13:07:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600657681; bh=dhUkL2f4HAZeyqjMRUfsy8JO2RKoK78IBKBPtNNovGw=; h=Date:From:To:Cc:Subject:From; b=A24X/rF6sK+WiYLx7PqUuRH4MZActArsLpxV22qQPbh+TiYXD0zGdB7GhWgy6B91B UPkqmtlpAAKW7c9/1rBW4o0/VxXOeCnCb/fSW3NT2AH51RH5PQovi7ylrVEiIGksp4 EFFDQtKif8tsSg/XS4vXFjUt+moXO8YcKOzDE5prDpP0eh9qtknGlSc7Hi8tp6el9+ 8jAI0BuzimyBOydwx2gCfRkwXEzgeHs7vKsYGAhsW++WkGrkjXVsbul7Fd5ba8UPAX n60abIAigwNJNo7jpzEBgZKlTkgLOWhiZocuH1T+dcNdsg9blhBYWMooNczVWtYfCS WPXJZcay1f8YQ== Date: Mon, 21 Sep 2020 13:07:57 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Rob Clark <robdclark@gmail.com>, Sean Paul <seanpaul@chromium.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the drm-msm tree with the drm tree Message-ID: <20200921130757.6ece7053@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: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Marek Szyprowski <m.szyprowski@samsung.com> Content-Type: multipart/mixed; boundary="===============1912923266==" 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-msm tree with the drm tree
|
expand
|
diff --cc drivers/gpu/drm/msm/msm_iommu.c index 6c31e65834c6,697cc0a059d6..000000000000 --- a/drivers/gpu/drm/msm/msm_iommu.c