Message ID | 20210406151454.54a9362f@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=3nI9=JD=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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 ABEB4C43460 for <dri-devel@archiver.kernel.org>; Tue, 6 Apr 2021 05:15:06 +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 169F86139C for <dri-devel@archiver.kernel.org>; Tue, 6 Apr 2021 05:15:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 169F86139C 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 67B11891BB; Tue, 6 Apr 2021 05:15:05 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80954891BB for <dri-devel@lists.freedesktop.org>; Tue, 6 Apr 2021 05:15:03 +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 4FDwh15TRHz9sRf; Tue, 6 Apr 2021 15:14:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617686100; bh=h3/+ne8Gi0fW/GZnyjboAtdNaIyXFaj6o239XXmEAi0=; h=Date:From:To:Cc:Subject:From; b=m1UsHvPyOAs913fX7C6MQKcF2pP4J2fHZ/FRP7yUE1R799GcJaoAx5YTj6sSX7nqo EPbTySSBuK2JWjNBSC92z2oQeDcE6/lDZkn1aXrso+i/VFvHt047Qxcpf7ZceHWH4z T4GZ2finXd1Y+g4FNkqj+tyaV8SrSPS0ujxdSYeGHKi0fIYYPAT4HAhc3zZRSUehye toO97x3AGyM2FtOLRULs/Y2k3krz6m8A7CbVETI7qL2uQkPGzOIM9T/nWFyuAaTdSh BOZKdmI7hqHReaKigbyTaHZSP5umnjt4uM8oJcb/kefNfSutyeH0+h5dL+hfJhgS/L w7wYhXIMhWDuw== Date: Tue, 6 Apr 2021 15:14:54 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Lucas Stach <l.stach@pengutronix.de>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the imx-drm tree with the drm tree Message-ID: <20210406151454.54a9362f@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>, Sebastian Reichel <sebastian.reichel@collabora.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Maxime Ripard <maxime@cerno.tech> Content-Type: multipart/mixed; boundary="===============0253449405==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> |
Series |
linux-next: manual merge of the imx-drm tree with the drm tree
|
expand
|
diff --cc drivers/gpu/drm/imx/ipuv3-plane.c index fa5009705365,26f2cc832101..000000000000 --- a/drivers/gpu/drm/imx/ipuv3-plane.c