From: Daniel Vetter <daniel@ffwll.ch>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Jani Nikula <jani.nikula@intel.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
linux-kernel@vger.kernel.org,
DRI <dri-devel@lists.freedesktop.org>,
linux-next@vger.kernel.org
Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree
Date: Wed, 4 Jan 2017 10:07:00 +0100 [thread overview]
Message-ID: <20170104090700.yikowiec7nrpgb3d@phenom.ffwll.local> (raw)
In-Reply-To: <20170103133717.319f60aa@t450s.home>
On Tue, Jan 03, 2017 at 01:37:17PM -0700, Alex Williamson wrote:
> On Tue, 03 Jan 2017 15:25:24 +0200
> Jani Nikula <jani.nikula@intel.com> wrote:
>
> > On Tue, 03 Jan 2017, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > > On 2017.01.02 21:48:57 -0700, Alex Williamson wrote:
> > >> > Alex, I liked to have kvmgt related mdev interface change be merged through
> > >> > vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply
> > >> > below fix in your tree? I think in general for possible interface change in
> > >> > future we still need a pull request for i915 to resolve dependence earlier.
> > >>
> > >> Hi Zhenyu,
> > >>
> > >> Hopefully this abstraction will help to isolate vendor drivers from
> > >> mdev API changes in the future. I can certainly roll this patch into
> > >> the original to maintain bisectability. I want to get these changes in
> > >> for rc3, will a pull request for the i915 changes be sent this week?
> > >
> > > Send to Jani who is managing i915 fixes pull.
> >
> > Send what to me? I've pushed fixes to drm-intel-fixes today for testing,
> > and expect to send a pull request to Dave early Thursday. If there's a
> > conflict, it can usually be solved while merging, like Stephen has done.
>
> Unless there's some preference otherwise, I was only asking if the i915
> changes were queued for rc3 such that I could trail behind them and
> fixup the mdev API change without relying on it getting caught in the
> merge. If we're happy to do it at merge time, I won't worry about it.
Dave Airlie is still on vacation, so I expect drm fixes pull request to
get a bit delayed. I think adding a warning when sending each respective
pull to Linus about this is the best approach, to avoid stalling mdev
fixes.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2017-01-04 9:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 23:42 Stephen Rothwell
2017-01-03 2:59 ` Zhenyu Wang
2017-01-03 4:07 ` Stephen Rothwell
2017-01-03 4:48 ` Alex Williamson
2017-01-03 9:23 ` Zhenyu Wang
2017-01-03 13:25 ` [Intel-gfx] " Jani Nikula
2017-01-03 20:37 ` Alex Williamson
2017-01-04 9:07 ` Daniel Vetter [this message]
2017-10-10 7:03 Mark Brown
2017-10-11 8:51 ` Mark Brown
2017-10-11 17:39 ` [Intel-gfx] " Rodrigo Vivi
2019-01-29 22:39 Stephen Rothwell
2019-01-29 22:53 ` [Intel-gfx] " Lucas De Marchi
2019-01-30 8:22 ` Jani Nikula
2022-01-31 22:27 Stephen Rothwell
2022-02-01 9:08 ` [Intel-gfx] " Tvrtko Ursulin
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=20170104090700.yikowiec7nrpgb3d@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=alex.williamson@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zhenyuw@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®