[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAPM=9tz3pFTOO45pGcZv+nGf29He-p03fXHbG4sNoCYxZzXkRQ@mail.gmail.com>
Date: Thu, 28 Nov 2019 12:37:06 +1000
From: Dave Airlie <airlied@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Daniel Vetter <daniel.vetter@...ll.ch>,
dri-devel <dri-devel@...ts.freedesktop.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm for 5.5-rc1
On Thu, 28 Nov 2019 at 11:51, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
>
> On Wed, Nov 27, 2019 at 4:59 PM Dave Airlie <airlied@...il.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.
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.
Powered by blists - more mailing lists