[git pull] drm for 5.5-rc1

Linus Torvalds torvalds at linux-foundation.org
Thu Nov 28 01:50:54 UTC 2019


On Wed, Nov 27, 2019 at 4:59 PM Dave Airlie <airlied at gmail.com> 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.

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?

Anyway, merged and pushed out,

            Linus


More information about the dri-devel mailing list