10:54 tomba: I pushed a fix, 3e9a1da270ddff449b1ad9eadc958f43bc204bd2 , to drm-misc-next, thinking that the original commit was not queued for the next merge window, but apparently it was. What's the proper thing to do here, push the fix to drm-misc-fixes too, and live with the duplicate commit? Or is it still drm-misc-next-fixes at this point of time...
13:48 phasta: I've got a new feature patch series here that makes an invisible bug visible. I also have a fix for that now. Would it still be the right thing to do to put the fix in misc-fixes and the feature in misc-next? tzimmermann airlied
13:50 phasta: because, if I understand the merge plan correctly, fix and feature would then only meet again in Linus's tree
13:51 tzimmermann: phasta, that feature series triggers a bug? and you also have a fix for that? you can put the fix into -misc-fixes. as soon as it reaches upstream, we can backmerge into drm-misc-next
13:51 tzimmermann: if the bug isn't sever, you can also put everything into drm-misc-next
13:52 phasta: tzimmermann: correct
13:52 phasta: https://lore.kernel.org/dri-devel/20260414133734.130115-3-phasta@kernel.org/
13:53 phasta: I feel it's probably better to go through misc-next. Otherwise people would see stack traces in misc-next for a while
13:54 tzimmermann: yeah, then do that. if the nouveau bug turns out to be critical, we can still cherry-pick as a last resort
13:54 phasta: OK, thank you
14:35 dschuermann: cwabbott: could you have a look at https://gitlab.freedesktop.org/mesa/mesa/-/jobs/97446938#L2336 ?
14:45 DottorLeo: Hi! @daniels about https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39551 it only affects X11 or even XWayland? Just to understand if something that uses Xwayland like games on Proton are affected
14:45 DottorLeo: Thanks!
14:48 jannau: phasta: is the mismatch between drm_sched_entity_flush() in the commit messages and drm_sched_entity_kill() in the change intended?
14:52 MrCooper: DottorLeo: Xwl in that MR stands for Xwayland
14:57 DottorLeo: MrCooper: the present timing extension that was merged while ago also need this MR to work on proton games?
14:58 MrCooper: when Proton uses an X display, yes, not when it uses Wayland natively though
15:02 phasta: jannau: oh. No it isn't. That's a relic, thx
15:12 DottorLeo: thanks!