| Message ID | 20210125114644.7b7cec67@canb.auug.org.au |
|---|---|
| State | New, archived |
| Headers | show |
| Series |
|
| Related | show |
diff --cc drivers/gpu/drm/i915/gem/i915_gem_object.h index 5274e9d139b4,ae83737f1d48..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_object.h between commit: 41a9c75d0acf ("drm/i915/gem: Move stolen node into GEM object union") from the drm tree and commit: 5fbc2c2bfa5c ("drm/i915/gem: Add a helper to read data from a GEM object page") from the drm-intel 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.