| Message ID | 20231003110957.34fc9483@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id
in14csp1766445vqb;
Mon, 2 Oct 2023 17:10:42 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEiPJFgt/akYSCJB/Omp2h6YF+JUaBsUyLmjZNNTTA7TUn8NMebCZ/3t0hRL7mUmHuXdmpi
X-Received: by 2002:a17:90b:4c4a:b0:273:efde:2ea4 with SMTP id
np10-20020a17090b4c4a00b00273efde2ea4mr11250233pjb.42.1696291841538;
Mon, 02 Oct 2023 17:10:41 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1696291841; cv=none;
d=google.com; s=arc-20160816;
b=vqWky0MNvV9c4wLxgnGKiGGgUFmGv9umyteEO9JSeJ8PBkpau+pumpyHqXDHqzqWJ/
Ie7pDJkCWW/WUtDhKs4VDgVFa22qWexcrv49MeGhB4dVa2izUHpAq8Mjxgp3+XkutWTz
mE0YbO9Rx/YBFfusX3z7fIZ8F/kwXp0N8IOJCekw1SOUNnxv/qkRkLUUZOYZ4yGwq4FJ
Ua/Zb5y8okbU9PzMCIfc+WLkZhZKPjjsNXSucSvzc5q+Vz/Ya0xVGjjLZDPzS6Yd92Ez
jCuoYTLSUpiua22Vyo8EFYVWRH8mPSt9IyyDsLYVTtZMhtXkoZ+n3paBqYZWSq07znXD
rTHQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=qxtEAZde4kFbj1tXH6gOwr/ukfnaFXq940/Y/rS7DbI=;
fh=vGFt5i3LX9NAV8pcYi7zuCJlRpXy1BqRI4XgkFABf/A=;
b=c3WEFdeH5G02BeC3WsUwM6CnziQ0atSRclHS0vNjQJU0uyNXypE65Xk8b4zg/JOcmJ
NAD40YABlKqZdhnW7I4paJKiPeH/BXAG54zNI37+XIHh2sJAw0rmWj5W55676o7NFTUn
OOKsiQj60oUyPPMz1/uPe92fdR+8hJxwkqrb0O/d0J+LedI9stvcnKsiFO5fAt1URJ3C
4pFEkcnHsDojZzWHP9i929+vgSqwy07yVVfvvhQ3zckNiXrlK15fboxAE1RuaUkzCabV
ZqctYKHOEo9F2enkXwDJ5c0+XTBndyCvM4ea/pPc20y4pkJi8XXyfnA6Z5cn63m7dAsH
MTPQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BGeedbwl;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33])
by mx.google.com with ESMTPS id
fz14-20020a17090b024e00b00268a8e0cab3si8234157pjb.178.2023.10.02.17.10.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 02 Oct 2023 17:10:41 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BGeedbwl;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.33 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by lipwig.vger.email (Postfix) with ESMTP id 7541980568EC;
Mon, 2 Oct 2023 17:10:20 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S237295AbjJCAKG (ORCPT <rfc822;pusanteemu@gmail.com> + 18 others);
Mon, 2 Oct 2023 20:10:06 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39098 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229595AbjJCAKF (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Oct 2023 20:10:05 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D2A9C6;
Mon, 2 Oct 2023 17:10:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1696291800;
bh=qxtEAZde4kFbj1tXH6gOwr/ukfnaFXq940/Y/rS7DbI=;
h=Date:From:To:Cc:Subject:From;
b=BGeedbwldabh6z6QF3gwU1NWR5TdET3CLkHcmT+oCs7uyug4oskTp9CJR7aEAOuax
if/JQ3NmFoZG0KvXqG5adK3yB/dOxIZ98zUNP3a/LsJSXH3pKKIdEwQKCyptVku9R4
uhNBOz8127rhdVwxb1ElMJZBjzIf++j5W6PkIkudKQY4pwYBZfQapBID+Any83e/9u
L5+MkoUO+7/A6xscCUXyNFgkBJIJwd6P3UI7JMHQEI8suJhOkyjaLiz0BWOCL/6Uja
4MG9b+jjAjsgV/4nPXCDqTzj+WfpRS+PqAQtRHlT8kLLnRCnDPMp+HebmKp28c5RB0
tKsjMSVVyrgBg==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rzyr66nM4z4x2r;
Tue, 3 Oct 2023 11:09:58 +1100 (AEDT)
Date: Tue, 3 Oct 2023 11:09:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@redhat.com>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matt Roper <matthew.d.roper@intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Message-ID: <20231003110957.34fc9483@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vcTvl.sbAssNW7vb1Uc0pbr";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]);
Mon, 02 Oct 2023 17:10:20 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1778690913598350265
X-GMAIL-MSGID: 1778690913598350265
|
| Series |
linux-next: manual merge of the drm-intel tree with the drm tree
|
|
Commit Message
Stephen Rothwell
Oct. 3, 2023, 12:09 a.m. UTC
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commits:
c9517783060a ("drm/i915/dg2: Drop Wa_16011777198")
5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP")
81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP")
from the drm tree and commits:
e50086f3d313 ("drm/i915/dg2: Drop pre-production display workarounds")
213454b3af2e ("drm/i915: Eliminate IS_MTL_DISPLAY_STEP")
from the drm-intel 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.
Comments
On Tue, 03 Oct 2023, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.h > > between commits: > > c9517783060a ("drm/i915/dg2: Drop Wa_16011777198") > 5a213086a025 ("drm/i915: Eliminate IS_MTL_GRAPHICS_STEP") > 81af8abe6513 ("drm/i915: Eliminate IS_MTL_MEDIA_STEP") > > from the drm tree and commits: > > e50086f3d313 ("drm/i915/dg2: Drop pre-production display workarounds") > 213454b3af2e ("drm/i915: Eliminate IS_MTL_DISPLAY_STEP") > > from the drm-intel 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. Should be fixed now. BR, Jani.
diff --cc drivers/gpu/drm/i915/i915_drv.h index e994bd2d69db,cc229f08dfdb..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h