| Message ID | 20221028105757.123c05c9@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp524429wru;
Thu, 27 Oct 2022 17:07:01 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM4so0AYcXp1c3hYQaLfoXa1psLqwUWyn6JCe6JiiUbfsMBzkJcVvHOXrTsTVpwI4KhCsuUF
X-Received: by 2002:a17:906:9c84:b0:7ad:90d9:a6cf with SMTP id
fj4-20020a1709069c8400b007ad90d9a6cfmr4528714ejc.595.1666915621316;
Thu, 27 Oct 2022 17:07:01 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666915621; cv=none;
d=google.com; s=arc-20160816;
b=eqPfB5xnC/DfQDjy2moIxTQwkU0vnEKCUJ4TDi7EKvVgzPiYjjAez7pCsgC2i80dSR
qhx3f9KOolG5Xz5ILUKIvhGxX6tq2lLSreS6sR0L1i26+Kd4iS7TemBaJoOPxNl9i6IZ
MVjEhq7mz9vtDCt8Iu/EVvQkRFX8j0nCwEEB2cPi0SXBL1CtxxF+tZoosX+5Bkf/8BmI
DXUwwrmmIytMcCs3q7uoHEZwUMBvzQ2eRm71v1uqdKiIcx3AGdx/xVxUsJ1ujCd7FL5d
MuLuqgWCAy9flXSYthSJJEuE8zKEMLfWzqco6yTvm0MJrHeMw2mZVNZI1umyeNSm3p4S
Sptw==
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=ddrk81J8bHwCRad9ZM5gwOArNofx9a2KFHicAz+ouIc=;
b=hjGsQjb+NYY8Sw5xTyKZmWu+ke0i2JfW2U62NNRN7vM6Y1Ke7NsQ5xhT4vVO4TtnKv
mKZBg/cUQ5xYLfYN/uBd3UHDF9K/L4KX7wWpjLwg5AQ15h0vALXw5RA+YIBWStwCICHj
vcLNgTYCirpIr6zSA/K5/9OdHEOmvZMbPjsiljn4uZI1cvx8jIQnoqm7ZghW6t8zjZP+
NUSRq3rJF7f1rCQlK01uCFFLLB1yp/bkIqHmTlu/zxu8dr8Ye/TQGMPbL3mP6doLWdLl
SUD0jnfnahpbVfTCRjbAU5Rl3xQ6zhTTDBbKCwfnF0FI5AwuGno0WtfNaurw35VYjP9Y
htCQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RWKsvQBS;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
g20-20020a056402181400b004571a669230si2341921edy.469.2022.10.27.17.06.36;
Thu, 27 Oct 2022 17:07:01 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RWKsvQBS;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S235683AbiJ0X6J (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 99 others); Thu, 27 Oct 2022 19:58:09 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36168 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229531AbiJ0X6G (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 27 Oct 2022 19:58:06 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAFF6719BF;
Thu, 27 Oct 2022 16:58:04 -0700 (PDT)
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 4Mz2gC1Qsxz4x1V;
Fri, 28 Oct 2022 10:57:59 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1666915080;
bh=ddrk81J8bHwCRad9ZM5gwOArNofx9a2KFHicAz+ouIc=;
h=Date:From:To:Cc:Subject:From;
b=RWKsvQBStioNmK5S90nGAkHGeQSQ/cdH0nKoINqdTlu/FTk7I/PHDYFVfmflU6eOu
oyxVz09AoORPWaSd5IY8lvamT+QxwxCVQJSXepLYPvWymVGVM5UCQ9Vy0263QtagwO
DNVBvOM8GGekl5nmEKwkzJqmrgF2yw9ETUHfeoZbxc3qgnoSPSbuiwQSmhsnIoKg+F
erIjnZ6isfP4q4S+vEyIcCU0m+UJCp7aSrKZlbsPswME3EBNlMWxtETGUQ8NG2nQi/
umyD+UedHPn6RBzbccuDFnTPu/YvlW4AdhC/d3Wu1nBHFz+5oWq72DP6J5hEKagcAp
U581BMDOKzxDA==
Date: Fri, 28 Oct 2022 10:57:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Dave Airlie <airlied@redhat.com>
Cc: DRI <dri-devel@lists.freedesktop.org>,
Alex Deucher <alexander.deucher@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yifan Zhang <yifan1.zhang@amd.com>,
Zack Rusin <zackr@vmware.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm tree
Message-ID: <20221028105757.123c05c9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AFy6pOsv//9MyZ397vV/N8=";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1747887714453140842?=
X-GMAIL-MSGID: =?utf-8?q?1747887714453140842?=
|
| Series |
linux-next: manual merge of the amdgpu tree with the drm tree
|
|
Commit Message
Stephen Rothwell
Oct. 27, 2022, 11:57 p.m. UTC
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
between commit:
7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")
from the drm tree and commit:
887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms")
from the amdgpu 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/amd/amdgpu/amdgpu_vkms.c index 09dec2561adf,500a1dc4fe02..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c