Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4306955pxv;
        Tue, 27 Jul 2021 04:16:13 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJzy3Wqjb/0OkaEHRlae9wbGVT725RBuW/oFmXLCipErOIbdgiApMIt3zMUJJ2S3a7OD4D8f
X-Received: by 2002:a05:6638:2516:: with SMTP id v22mr20894709jat.144.1627384572973;
        Tue, 27 Jul 2021 04:16:12 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1627384572; cv=none;
        d=google.com; s=arc-20160816;
        b=CmQFt6abT4zNbDWhNKy1SKFf87ASrvfH5nk1sW1SniNOCiXl2sese3J/nO0BqBYeKt
         1Dob38rwEobmfz+YnDstjRxLnqNfhUtcndI39Ap5nRAlN5vya0Ze7ewzN+7IibmgNz2m
         7F+BDsalkIYEz+VxfB2VV0tVDLMG7WmTUp4rnXIh0zEv1AQgFxBYzrFDZMrTbgTve9ip
         BMrU94Z0M00GjsBof4nJYfFMfI1pjuubBN72mhJmrbAgrUeUxbXb/ICiZvAnU6gMK0HL
         0VEwIoNsaGXjMVGw1KX7X4nT2oqs1jFGevFYEeGXlDg3TMTlRpY4lQvweFf3RW/rDya1
         pxAw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:content-transfer-encoding:mime-version
         :message-id:date:subject:cc:to:from:dkim-signature;
        bh=N+ODZVcSaE/eUeMCvPsI/I0FT6stwQOktCOdG7wsl7w=;
        b=S0MwfF/c4cNYolFUnPQYADlNc6Ohp0vFMhkbEgxUDRrbbv5DVyWw2V6P6McdBeFwQD
         U0bPJ7J/3fonl0l8Q/Tnb+NYr2yyYn3WQfl/thtHdPw836qmu879zFs44C20GjfrDumK
         jzA/VCsqkN3x+fdZZmMBrM4InnxUD3e67OUcGI2a/zutTuYSYk8E/0L8kPHnZC5uPsUB
         c4TyRGNmoTSZv8rlFHA4zcT9KNMWggmwnxsAt5a2cJE7BuJFFTUohNdNDDilCC5c73Kk
         RVINJoyJI2+URL8MwMklQPzZC51M/+0GCk/lbx4QuZwTh6LD8vcxs8xIp8WR480/K1K4
         o8kw==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FcemJGhQ;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id u6si2766650ioc.42.2021.07.27.04.16.01;
        Tue, 27 Jul 2021 04:16:12 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FcemJGhQ;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S236403AbhG0LPD (ORCPT <rfc822;linux.whf@gmail.com> + 99 others);
        Tue, 27 Jul 2021 07:15:03 -0400
Received: from mail.kernel.org ([198.145.29.99]:37072 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S236301AbhG0LPC (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 27 Jul 2021 07:15:02 -0400
Received: by mail.kernel.org (Postfix) with ESMTPSA id F184A619E7;
        Tue, 27 Jul 2021 11:15:01 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=k20201202; t=1627384502;
        bh=SHNmjykDf+/IHH82HQeFn3YwhgbHyD3jCgQMSP69lOI=;
        h=From:To:Cc:Subject:Date:From;
        b=FcemJGhQdYRVe3m7zefdJe3mE01yPbdu6/pSiqD+oMEaq5E1aNeu92z8xkuJt2mn4
         BYrGadW6e+eWvW2kBIh0nV00K9vCimI23lU7GPwJoc86AlFhfdqrJrBawLDdXMUBY6
         8bPr9ULDjldPEZgZX+hz4YhIpl2+heI74hSgOQ2aGJ2JNrstig/1TVbN6027Hqc+Lg
         rTCNC2q/mQ9zEjxjNXxe9c+7eUUt9sToLS5lxW8Xc1BNL+U5d0nAyAPmy7WhXkB9yw
         Y7iVEA/EqL3qROZR3dzxFFFhZ6AgNjvub2Mp3ONnpaskP+RXXtzaT05rSWI+wnvu5J
         nHoNaG+LYge9g==
From:   Mark Brown <broonie@kernel.org>
To:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Zack Rusin <zackr@vmware.com>
Subject: linux-next: manual merge of the drm-misc tree with the drm-next tree
Date:   Tue, 27 Jul 2021 12:14:47 +0100
Message-Id: <20210727111448.1443-1-broonie@kernel.org>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

between commit:

  ebc9ac7c3dfe ("drm/vmwgfx: Update device headers")

from the drm-next tree and commit:

  be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 356f82c26f59,5652d982b1ce..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h