Messages in this thread | | | From | Jani Nikula <> | Subject | Re: linux-next: manual merge of the drm tree with the kbuild tree | Date | Wed, 19 Jun 2019 10:38:09 +0300 |
| |
On Wed, 19 Jun 2019, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/i915/Makefile.header-test > > between commit: > > e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained") > > from the kbuild tree and commits: > > 112ed2d31a46 ("drm/i915: Move GraphicsTechnology files under gt/") > d91e657876a9 ("drm/i915: Introduce struct intel_wakeref") > aab30b85c97a ("drm/i915: ensure more headers remain self-contained") > b375d0ef2589 ("drm/i915: extract intel_vdsc.h from intel_drv.h and i915_drv.h") > > from the drm 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.
LGTM, thanks.
BR, Jani.
-- Jani Nikula, Intel Open Source Graphics Center
| |