Messages in this thread | ![/](/images/icornerl.gif) | | Date | Fri, 20 Jan 2023 11:32:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the accel tree with the drm-misc tree |
| |
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/ [unhandled content-type:application/pgp-signature] | ![\](/images/icornerr.gif) |