linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_fb.c

between commit:

86af6b90e0556 ("drm/i915/fb: Fix the set_tiling vs. addfb race, again")

from the drm-intel-fixes tree and commits:

1d1e4ded21601 ("drm/i915/fb: Fix the set_tiling vs. addfb race, again") d76eeea515700 ("drm/i915/fb: Drop the 'fb' argument from intel_fb_bo_framebuffer_init()")

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.

diff --cc drivers/gpu/drm/i915/display/intel_fb.c
index b817ff44c0439,3958628c73e97..0000000000000
@@@ -2323,6 -2327,9 +2327,8 @@@ err_bo_framebuffer_fini
  	intel_fb_bo_framebuffer_fini(obj);
  err_frontbuffer_put:
  	intel_frontbuffer_put(intel_fb->frontbuffer);
+ err_free_panic:
+ 	kfree(intel_fb->panic);
 -
  	return ret;
  }