14 Aug
2019
14 Aug
'19
3:20 a.m.
Hi all,
Today's linux-next merge of the etnaviv tree got a conflict in:
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
between commit:
52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv")
from the drm-misc tree and commit:
6eae41fea750 ("drm/etnaviv: drop use of drmP.h") 2e737e520548 ("drm/etnaviv: clean up includes")
from the etnaviv 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 998c96b40d8a,f535a627f297..000000000000
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@@ -3,9 -3,15 +3,15 @@@
* Copyright (C) 2015 Etnaviv Project
*/
+ #include <drm/drm_file.h>
#include <linux/dma-fence-array.h>
+ #include <linux/file.h>
+ #include <linux/pm_runtime.h>
-#include <linux/reservation.h>
+#include <linux/dma-resv.h>
#include <linux/sync_file.h>
+ #include <linux/uaccess.h>
+ #include <linux/vmalloc.h>
+
#include "etnaviv_cmdbuf.h"
#include "etnaviv_drv.h"
#include "etnaviv_gpu.h"