From: Jani Nikula <jani.nikula@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: linux-next: manual merge of the drm tree with the kbuild tree
Date: Wed, 19 Jun 2019 10:38:09 +0300 [thread overview]
Message-ID: <87imt2m3dq.fsf@intel.com> (raw)
In-Reply-To: <20190619141949.38e661e6@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-06-19 7:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 4:19 linux-next: manual merge of the drm tree with the kbuild tree Stephen Rothwell
2019-06-19 7:38 ` Jani Nikula [this message]
2019-07-08 23:29 ` Stephen Rothwell
2019-09-04 6:46 Stephen Rothwell
2019-09-04 23:43 ` Nick Desaulniers
2019-09-15 21:47 Mark Brown
2019-09-16 21:06 ` Nick Desaulniers
2019-09-16 22:18 ` Mark Brown
2019-11-18 0:17 Stephen Rothwell
2019-11-18 0:17 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87imt2m3dq.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.