Re: [git pull] drm for 5.5-rc1

2019-11-28 Thread Stephen Rothwell
Hi Dave, On Fri, 29 Nov 2019 09:13:16 +1000 Dave Airlie wrote: > > On Fri, 29 Nov 2019 at 07:55, Stephen Rothwell wrote: > > > > Hi Dave, > > > > On Thu, 28 Nov 2019 12:37:06 +1000 Dave Airlie wrote: > > > > > > > And apparently nobody bothered to tell me about the semantic conflict > > > >

Re: [git pull] drm for 5.5-rc1

2019-11-28 Thread Dave Airlie
On Fri, 29 Nov 2019 at 07:55, Stephen Rothwell wrote: > > Hi Dave, > > On Thu, 28 Nov 2019 12:37:06 +1000 Dave Airlie wrote: > > > > > 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_ad

Re: [git pull] drm for 5.5-rc1

2019-11-28 Thread Stephen Rothwell
Hi Dave, On Thu, 28 Nov 2019 12:37:06 +1000 Dave Airlie wrote: > > > 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 n

Re: [git pull] drm for 5.5-rc1

2019-11-27 Thread Dave Airlie
On Thu, 28 Nov 2019 at 11:51, Linus Torvalds wrote: > > On Wed, Nov 27, 2019 at 4:59 PM Dave Airlie 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()

Re: [git pull] drm for 5.5-rc1

2019-11-27 Thread pr-tracker-bot
The pull request you sent on Thu, 28 Nov 2019 10:59:16 +1000: > git://anongit.freedesktop.org/drm/drm tags/drm-next-2019-11-27 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/a6ed68d6468bd5a3da78a103344ded1435fed57a Thank you! -- Deet-doot-dot, I am a bot. https://ko

Re: [git pull] drm for 5.5-rc1

2019-11-27 Thread Linus Torvalds
On Wed, Nov 27, 2019 at 4:59 PM Dave Airlie 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 2