Messages in this thread | | | Subject | Re: linux-next: build failure after merge of the drm-misc tree | From | Hans de Goede <> | Date | Fri, 21 Jul 2017 21:01:59 +0200 |
| |
Hi,
On 21-07-17 09:24, Daniel Vetter wrote: > Hi Greg&Hans, > > 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. > > Or you could just delete the set_busid hook in -staging, which renders > the driver unbisectable since it'll only work when merged together > with the drm trees.
Removing the set_busid hook in staging (but only for -next, not for -linus) is fine with me.
Regards,
Hans
| |