On Thu, 28 Nov 2019 at 11:51, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Wed, Nov 27, 2019 at 4:59 PM Dave Airlie <airlied@xxxxxxxxx> wrote: > > > > my sample merge is here: > > https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-next-5.5-merged > > Hmm. I think you missed a couple: you left a duplicate > intel_update_rawclk() around (it got moved into > intel_power_domains_init_hw() by commit 2f216a850715 ("drm/i915: > update rawclk also on resume"), and you left the "select > REFCOUNT_FULL" that no longer exists. Oops so I should have more caffeine before I did that merge, thanks for catching those. > > And apparently nobody bothered to tell me about the semantic conflict > with the media tree due to the changed calling convention of > cec_notifier_cec_adap_unregister(). Didn't that show up in linux-next? I can see no mention of it, I've got Hans saying "This will only be a problem if a new CEC adapter driver is added to the media subsystem for v5.5, but I am not aware of any plans for that." when I landed that in my tree, but I assume the ao-cec change in the media tree collided with it. But I hadn't seen any mention of it from -next before you mentioned it now. Dave. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
