Message ID | 20191009103315.2f51e079@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=ghPB=YB=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 D7D1F76 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 8 Oct 2019 23:33:28 +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 C047B21721 for <patchwork-dri-devel@patchwork.kernel.org>; Tue, 8 Oct 2019 23:33:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C047B21721 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 5F9E86E8B3; Tue, 8 Oct 2019 23:33:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 86554 seconds by postgrey-1.36 at gabe; Tue, 08 Oct 2019 23:33:24 UTC Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 382E36E8B2; Tue, 8 Oct 2019 23:33:24 +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 46ntvJ56D9z9sPL; Wed, 9 Oct 2019 10:33:15 +1100 (AEDT) Date: Wed, 9 Oct 2019 10:33:15 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the drm-misc tree with the drm tree Message-ID: <20191009103315.2f51e079@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1570577600; bh=fCLq555CwsBdqSzNieFbT3yrcFvZ41mOJHpYKXLuEEk=; h=Date:From:To:Cc:Subject:From; b=kNyrXxEEy+s6GUEsPHqrCt1SsWqkv2V8WnRI98eGaBKtXJLJdtrHpaijx4vD32OH+ tBCU/BXR6DCnkCBzMejqLrvWOmYLU4CwjQRkUD47HJbkHyy3dZhbl8KDVu4EzqhPRg DuHvY1usvbNtiojl78qd0leCOnXgMWrtKRJFW54bXxSZQv6eUBQ4mltZxtk3LGUUA+ XMk3ZxX4Ue0tvTlO5YuZIsUI0NidWXtu/FseB+igHF9CJ62nAdrIwAi5pqgZ1s/GXz /pJUkNodm3Qmuxdlt0sWAl629X/ghl5RNWXG2SvT4XcrfFRJIejyjxkw/all4oJH5r viVf/on8Sne+A== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 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: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Content-Type: multipart/mixed; boundary="===============0329963900==" 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-misc tree with the drm tree
|
expand
|
diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e8ddc2320efa,493f07806b08..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c