Message ID | 20191113114619.0562659e@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=/Yxj=ZF=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 4A5B413B1 for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 13 Nov 2019 00:46:26 +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 2D46F21A49 for <patchwork-dri-devel@patchwork.kernel.org>; Wed, 13 Nov 2019 00:46:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D46F21A49 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 507C96E057; Wed, 13 Nov 2019 00:46:23 +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 53F856E057 for <dri-devel@lists.freedesktop.org>; Wed, 13 Nov 2019 00:46:22 +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 47CQsS1bYjz9sPh; Wed, 13 Nov 2019 11:46:20 +1100 (AEDT) Date: Wed, 13 Nov 2019 11:46:19 +1100 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: <20191113114619.0562659e@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=1573605980; bh=Cfu0M8kThALcEqe2HrOjz3qJOIlvCWAsX9fy7Q9sPdo=; h=Date:From:To:Cc:Subject:From; b=p1v6IzOA/1nkHRibV1EEAj6npc1X8TbGFHkw6s2wkIFRboqNAMaDaXA4G6bzv5TEn mVaNOckns/uBs6JUmB08/AF7FAno+NGsqPgm98kTSmYS14I1+ZwROvojoFaiCQqpGE upnuAWyDLxlqopCmED1GbhkFwcIzX6pe9kr+w/HaH6q3+2wnYhq77vj+55wT8IG3sm YE5OIiy//kV7ppOCuVsz1nVae8AwuSd7K/MgtcWAPR6pWJjiewl7FhPhwiow2vN8rx LcOuaOx6aEOF7EPMdheRcL2RsvO5vJv+sKCnEqbt1dOsIKlQ/v48imRV5kj2toYnYf xtdSfjEIs18RQ== 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: Mika Kuoppala <mika.kuoppala@linux.intel.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Jon Bloomfield <jon.bloomfield@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Content-Type: multipart/mixed; boundary="===============1575872856==" 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/i915/gt/intel_engine_types.h index 9dd8c299cb2d,c5d1047a4bc5..000000000000 --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h