This is a note to let you know that I've just added the patch titled drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n to the 6.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 2130b87b2273389cafe6765bf09ef564cda01407 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor <nathan@xxxxxxxxxx> Date: Fri, 14 Oct 2022 08:21:03 -0700 Subject: drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Nathan Chancellor <nathan@xxxxxxxxxx> commit 2130b87b2273389cafe6765bf09ef564cda01407 upstream. After commit 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition"), a build with CONFIG_DEBUG_FS=n is broken due to a misplaced brace, along the lines of: In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_trace.h:39, from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:41: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level: ./include/drm/drm_atomic.h:864:9: error: expected identifier or ‘(’ before ‘for’ 864 | for ((__i) = 0; \ | ^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8317:9: note: in expansion of macro ‘for_each_new_crtc_in_state’ 8317 | for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Move the brace within the #ifdef so that the file can be built with or without CONFIG_DEBUG_FS. Fixes: 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition") Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx> Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8329,8 +8329,8 @@ static void amdgpu_dm_atomic_commit_tail crtc, dm_new_crtc_state, cur_crc_src)) DRM_DEBUG_DRIVER("Failed to configure crc source"); } -#endif } +#endif } for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) Patches currently in stable-queue which might be from nathan@xxxxxxxxxx are queue-6.0/mips-bcm47xx-cast-memcmp-of-function-to-void.patch queue-6.0/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch queue-6.0/net-korina-fix-return-type-of-korina_send_packet.patch queue-6.0/usb-gadget-uvc-fix-argument-to-sizeof-in-uvc_register_video.patch queue-6.0/net-davicom-fix-return-type-of-dm9000_start_xmit.patch queue-6.0/drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch queue-6.0/fortify-fix-__compiletime_strlen-under-ubsan_bounds_.patch queue-6.0/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch queue-6.0/riscv-pass-mno-relax-only-on-lld-15.0.0.patch queue-6.0/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch queue-6.0/x86-paravirt-add-extra-clobbers-with-zero_call_used_.patch queue-6.0/powerpc-math_emu-efp-include-module.h.patch