linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
Subsystems (3)
Hi all,
Today's linux-next merge of the drm-intel-gt tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commit:
2ef97818d3aa ("drm/i915: split out i915_gem_evict.h from i915_drv.h")
from the drm-intel tree and commit:
7e00897be8bf ("drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something, v2.")
from the drm-intel-gt tree.
I fixed it up (I used the former and adde the following merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Tue, 25 Jan 2022 09:44:44 +1100
Subject: [PATCH] merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
--- drivers/gpu/drm/i915/i915_gem_evict.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem_evict.h +2 -0
@@ -12,11 +12,13 @@ struct drm_mm_node;struct i915_address_space ;int __must_check i915_gem_evict_something (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,u64 min_size,u64 alignment,unsigned long color,u64 start,u64 end,unsigned flags);int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,unsigned int flags);int i915_gem_evict_vm (struct i915_address_space *vm);
Signature · 14 lines
2.34.1
But then I also needed due to commit:
6945c53bc712 ("drm/i915: Add locking to i915_gem_evict_vm(), v3.")
From: Stephen Rothwell <[email protected]>
Date: Tue, 25 Jan 2022 09:51:55 +1100
Subject: [PATCH] extra merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/gpu/drm/i915/i915_gem_evict.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem_evict.h +2 -1
@@ -21,6 +21,7 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,struct i915_gem_ww_ctx *ww, struct drm_mm_node *node, unsigned int flags); -int i915_gem_evict_vm (struct i915_address_space *vm); +int i915_gem_evict_vm (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww);#endif /* __I915_GEM_EVICT_H__ */
Signature · 15 lines
2.34.1
And then this due to commit
e849f7e70860 ("drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors, v2.")
(and the above commit)
From: Stephen Rothwell <[email protected]>
Date: Tue, 25 Jan 2022 10:02:16 +1100
Subject: [PATCH] extra 2 merge fix for "drm/i915: split out i915_gem_evict.h from i915_drv.h"
Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 +
1 file changed, 1 insertion(+)drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -0
@@ -21,6 +21,7 @@#include "i915_trace.h" #include "i915_user_extensions.h" #include "i915_gem_ttm.h" +#include "i915_gem_evict.h" #include "i915_vma.h" static inline bool
Signature · 5 lines
2.34.1 -- Cheers, Stephen Rothwell
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
== Series Details ==
== Series Details ==
Series: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
URL : https://patchwork.freedesktop.org/series/99294/
State : failure
== Summary ==
Applying: linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_gem_evict.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".