Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1694537

Re: linux-next: build failure after merge of the drm-misc tree

Show all headers | View raw

On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Daniel,
>
> On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>
>> How are we going to handle this now? The refactor is deeply burried in
>> drm-misc, I guess you could cherry-pick the relevant patches over. But
>> that'll probably lead to more conflicts because git will get confused.
>
> I'll just keep applying the merge resolution patch and will remind Dave
> and Greg about it during the week before the merge window opens so that
> they can let Linus know that the fix up is needed.

Well, Greg squeezed the vbox driver into -rc2, so now we already get
to resolve this in a backmerge. And hopefully the bikeshed patches in
-staging won't interfere too badly with whatever refactoring we'll do
in drm-next.

Greg, fyi this is the last time I'll ack a drm driver for staging.
This just doesn't work. We're spending more time here working the
-staging vs. drm-next conflicts than the actual vbox driver review has
taken me. And probly less than the cleanup for merging directly to
drm-next will end up taking.

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-19 04:00 +0200
  Re: linux-next: build failure after merge of the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-21 02:10 +0200
    Re: linux-next: build failure after merge of the drm-misc tree Daniel Vetter <daniel.vetter@ffwll.ch> - 2017-07-21 09:30 +0200
      Re: linux-next: build failure after merge of the drm-misc tree Hans de Goede <hdegoede@redhat.com> - 2017-07-21 21:10 +0200
      Re: linux-next: build failure after merge of the drm-misc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-24 02:10 +0200
        Re: linux-next: build failure after merge of the drm-misc tree Daniel Vetter <daniel.vetter@ffwll.ch> - 2017-07-24 10:30 +0200
          Re: linux-next: build failure after merge of the drm-misc tree Greg KH <greg@kroah.com> - 2017-07-24 20:40 +0200

csiph-web