From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Oded Gabbay <ogabbay@kernel•org>, Daniel Vetter <daniel.vetter@ffwll•ch>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Jacek Lawrynowicz <jacek.lawrynowicz@linux•intel.com>,
Krystian Pradzynski <krystian.pradzynski@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the accel tree with the drm-misc tree
Date: Fri, 20 Jan 2023 11:32:46 +1100 [thread overview]
Message-ID: <20230120113246.1a0a03fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]
Hi all,
Today's linux-next merge of the accel tree got conflicts in:
drivers/Makefile
drivers/accel/Kconfig
drivers/accel/Makefile
between commit:
35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU")
from the drm-misc tree and commit:
45886b6fa0f1 ("habanalabs: move driver to accel subsystem")
from the accel tree.
I fixed it up (I used the latter version of Makefile and 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/accel/Kconfig
index 4989376e5938,a5989b55178a..000000000000
--- a/drivers/accel/Kconfig
+++ b/drivers/accel/Kconfig
@@@ -23,4 -23,4 +23,5 @@@ menuconfig DRM_ACCE
different device files, called accel/accel* (in /dev, sysfs
and debugfs).
+ source "drivers/accel/habanalabs/Kconfig"
+source "drivers/accel/ivpu/Kconfig"
diff --cc drivers/accel/Makefile
index b1036dbc0ba4,4df38885d6c6..000000000000
--- a/drivers/accel/Makefile
+++ b/drivers/accel/Makefile
@@@ -1,3 -1,3 +1,4 @@@
# SPDX-License-Identifier: GPL-2.0-only
-obj-y += habanalabs/
++obj-y += habanalabs/
+obj-y += ivpu/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-20 0:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 0:32 Stephen Rothwell [this message]
2023-01-22 9:31 ` linux-next: manual merge of the accel tree with the drm-misc tree Oded Gabbay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120113246.1a0a03fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jacek.lawrynowicz@linux$(echo .)intel.com \
--cc=krystian.pradzynski@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ogabbay@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox