Merge branch 'master' into next

diff --cc package/libcamera/libcamera.mk
Simple merge

diff --cc package/prosody/Config.in
index d57da00a94546616db18dc7a77de767f2e89dc73,bb3a5025faf1a161685fca048fe1b60184127d47..d93350702c34317939120f06c547821ed4d88f65
--- 1/package/prosody/Config.in
--- 2/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@@ -2,9 -2,8 +2,9 @@@ config BR2_PACKAGE_PROSOD
        bool "prosody"
        depends on BR2_USE_MMU # fork
        depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 +      depends on !BR2_PACKAGE_LUA_5_4
        depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem
-       select BR2_PACKAGE_LUABITOP if !BR2_PACKAGE_LUAJIT # runtime
+       select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime
        select BR2_PACKAGE_LUAEXPAT # runtime
        select BR2_PACKAGE_LUASEC # runtime
        select BR2_PACKAGE_LUASOCKET # runtime

diff --cc package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
Simple merge