Message ID | 20201105120841.353f981f@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=ycYK=EL=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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 72595C388F7 for <dri-devel@archiver.kernel.org>; Thu, 5 Nov 2020 01:08:49 +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 AA8DB208C7 for <dri-devel@archiver.kernel.org>; Thu, 5 Nov 2020 01:08:48 +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="YsOc8d2t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA8DB208C7 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 489366E86F; Thu, 5 Nov 2020 01:08:47 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F5576E86F for <dri-devel@lists.freedesktop.org>; Thu, 5 Nov 2020 01:08:46 +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 4CRQQ316BDz9sTK; Thu, 5 Nov 2020 12:08:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1604538524; bh=oi6ob72AUai3KbvsuEo7KDpVVeH1BIO8XzCS7g+cu0Q=; h=Date:From:To:Cc:Subject:From; b=YsOc8d2tvWJfY32gPLUhB+BRKi/UOnuoOrVHJex29FfmNSUP6U9aLBv23fV8ZpI9X DRnP4NM1wKZuqX9Txuk9b65sg5FjBHI709aX2x25+ABSJAnMQefmUv9AVXOq0LP6YV wvodQd885KiGajwDeks28TmnvhWzFhw8fzN5WG6B40SLFn92wAIiiPgssS4CgS8pw0 VK0DWuqt8XqtAU9yqEkA+Ve+A08fZ2Qpj8E6c8BVz3E2+/f4Q8+bnTM4Lj79Pwwd5C v6mxCnOyA+Os7+19tJHZEMmdi/4oaCuTvy0uWSyllzgUOAIpAh9K03eIjEbtqDhH1b MjuzlnVB/dyrg== Date: Thu, 5 Nov 2020 12:08:41 +1100 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: <20201105120841.353f981f@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: Jani Nikula <jani.nikula@intel.com>, Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>, Linux Next Mailing List <linux-next@vger.kernel.org>, Rob Clark <robdclark@chromium.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Content-Type: multipart/mixed; boundary="===============2018489301==" 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 include/drm/drm_crtc.h index ba839e5e357d,cd42f79b2890..000000000000 --- a/include/drm/drm_crtc.h