diff --git a/Makefile b/Makefile
index 7af6774be8a662bcde966513416c49f1839fe9d9..19917c88a81f4df2303e4b55ae92224da5f0aeda 100644
--- a/Makefile
+++ b/Makefile
@@ -782,8 +782,11 @@ endif
 # These warnings generated too much noise in a regular build.
 # Use make W=1 to enable them (see scripts/Makefile.extrawarn)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
+
+# These result in bogus false positives
+KBUILD_CFLAGS += $(call cc-disable-warning, dangling-pointer)
+
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
 else
diff --git a/dist/sources/MLNX_OFED_SRC-5.1-2.5.8.0.46.tgz b/dist/sources/MLNX_OFED_SRC-5.1-2.5.8.0.46.tgz
deleted file mode 100644
index 1247913c31b160e38395f3c6bb58fb2ba2884aac..0000000000000000000000000000000000000000
Binary files a/dist/sources/MLNX_OFED_SRC-5.1-2.5.8.0.46.tgz and /dev/null differ
diff --git a/dist/sources/filter-aarch64.sh b/dist/sources/filter-aarch64.sh
index 98d4e147c2bed7fb9244fb80979ff1283d9fbadd..ba038907715d4019a4671b216f787c2f9a976922 100755
--- a/dist/sources/filter-aarch64.sh
+++ b/dist/sources/filter-aarch64.sh
@@ -11,10 +11,10 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio w1 ofed_addon"
+driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio w1"
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell micrel myricom neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
 drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_ib mlx5_core mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo configs"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_ib mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo configs"
diff --git a/dist/sources/filter-modules.sh b/dist/sources/filter-modules.sh
index 4eaa27d1a0bf9afcdbcbae6c4fa2b5956d325dcf..9389d48e08080ab1a29029ec9b3e0292e4dd49fe 100755
--- a/dist/sources/filter-modules.sh
+++ b/dist/sources/filter-modules.sh
@@ -17,7 +17,7 @@
 
 # Set the default dirs and modules to filter out as external modules
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga iio infiniband isdn leds media memstick message mfd mmc mtd nfc ntb pcmcia platform power powercap ssb soundwire staging thermal tty uio w1 ofed_addon"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga iio infiniband isdn leds media memstick message mfd mmc mtd nfc ntb pcmcia platform power powercap ssb soundwire staging thermal tty uio w1"
 
 chardrvs="mwave pcmcia"
 
diff --git a/dist/sources/tlinux_cciss_link_compat.modules b/dist/sources/tlinux_cciss_link_compat.modules
deleted file mode 100644
index 442be6a0c723bf4926ffa55cb709256d9a27725a..0000000000000000000000000000000000000000
--- a/dist/sources/tlinux_cciss_link_compat.modules
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ -b /dev/sda  -a ! -b /dev/cciss/c0d0 ]; then
-	mkdir -p /dev/cciss
-	set -- 0 a 1 b 2 c 3 d 4 e 5 f 6 g 7 h 8 i 9 j 10 k 11 l 12 m 13 n 14 o 15 p
-	while [ $# -ge 2 ]; do
-		c=/dev/cciss/c0d$1; shift
-		s=/dev/sd$1; shift
-		ln -s ${s}  ${c}
-		ln -s ${s}1 ${c}p1
-		ln -s ${s}2 ${c}p2
-		ln -s ${s}3 ${c}p3
-		ln -s ${s}4 ${c}p4
-	done
-fi
-
diff --git a/dist/templates/kernel.template.spec b/dist/templates/kernel.template.spec
index 8b64393944f51fbd5993af3ce8b126bfd2175c22..3db838dd4c2ebf933d2b290052ce1bdca7b676e5 100644
--- a/dist/templates/kernel.template.spec
+++ b/dist/templates/kernel.template.spec
@@ -194,10 +194,6 @@ Source30: check-kabi
 # Start from Source2000 to Source2999, for userspace tools
 Source2000: cpupower.service
 Source2001: cpupower.config
-Source2002: tlinux_cciss_link_compat.modules
-
-### TK4 MLNX OFED
-Source3000: MLNX_OFED_SRC-5.1-2.5.8.0.46.tgz
 
 ###### Kernel package definations ##############################################
 ### Main meta package
@@ -922,11 +918,6 @@ InstTools() {
 	install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo
 	install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
 	popd
-
-%ifarch x86_64
-	mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules
-	install -m755 %{SOURCE2002} %{buildroot}%{_sysconfdir}/sysconfig/modules
-%endif
 	# with_tools
 }
 
@@ -957,72 +948,6 @@ CollectKernelFile() {
 	mv %{buildroot}/{core.list,modules.list} ../
 }
 
-BuildInstMLNXOFED() {
-	inst_mod() {
-		src_mod=$1
-		src_mod_name=$(basename "$src_mod")
-		dest=""
-
-		# Replace old module
-		for mod in $(find $KernModule -name "*$src_mod_name*"); do
-			echo "MLNX_OFED: REPLACING: kernel module $mod"
-			dest=$(dirname "$mod")
-			rm -f "$mod"
-		done
-
-		# Install new module
-		if [ ! -d "$dest" ]; then
-			echo "MLNX_OFED: NEW: kernel module $dest/$mod"
-			dest="$KernModule/kernel/drivers/ofed_addon"
-			mkdir -p $dest
-		fi
-
-		cp -f "$src_mod" "$dest/"
-	}
-
-	handle_rpm() {
-		rm -rf extracted
-		mkdir -p extracted && pushd extracted
-
-		rpm2cpio $1 | cpio -id
-		find . -name "*.ko" -or -name "*.ko.xz" | while read -r mod; do
-			inst_mod "$mod"
-		done
-		# find . -name "*.debug" | while read -r mod; do
-		#       inst_debuginfo "$mod"
-		# done
-
-		popd
-	}
-
-	mkdir mlnx-ofed
-	pushd mlnx-ofed
-
-	tar -xzvf %{SOURCE3000}
-	pushd MLNX_OFED_SRC*
-
-	# Unset $HOME, when doing koji build, koji insert special macros into ~/.rpmmacros that will break MLNX installer:
-	# Koji sets _rpmfilename  %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm,
-	# But the installer assumes "_rpmfilename %{_build_name_fmt}" so it will fail to find the built rpm.
-	DISTRO=$(echo "%{?dist}" | sed "s/\.//g")
-	HOME= ./install.pl --build-only --kernel-only --without-depcheck --distro $DISTRO \
-	--kernel $KernUnameR --kernel-sources $KernDevel \
-	--without-mlx5_fpga_tools --without-mlnx-rdma-rxe --without-mlnx-nfsrdma \
-	--without-mlnx-nvme --without-isert --without-iser --without-srp --without-rshim --without-mdev \
-	--disable-kmp
-
-	# get all kernel module rpms that were built against target kernel
-	find RPMS -name "*.rpm" -type f | while read -r pkg; do
-		if rpm -qlp $pkg | grep "\.ko" | grep -q "$KernelUnameR"; then
-			handle_rpm "$(realpath $pkg)"
-		fi
-	done
-
-	popd
-
-	popd
-}
-
 ###### Start Kernel Install
 
 %if %{with_core}
@@ -1039,8 +964,6 @@ InstKernelDevel
 InstKernelHeaders
 %endif
 
-BuildInstMLNXOFED
-
 %if %{with_perf}
 InstPerf
 %endif
@@ -1221,11 +1144,6 @@ fi
 %ghost /lib/modules/%{kernel_unamer}/modules.symbols.bin
 
 %files modules -f modules.list
-%ifarch x86_64
-# This might be duplicated with tlinux_cciss_link.modules from kernel-tlinux package, but that's fine
-# since the script itself checks if it's neccessary to re-apply the workaround
-%{_sysconfdir}/sysconfig/modules/tlinux_cciss_link_compat.modules
-%endif
 %defattr(-,root,root)
 
 %files devel
diff --git a/package/arm/config.default b/package/arm/config.default
index 3b518c7dff3a965d566a3ad8dc0dfe7d33be6e30..684a175a44dc7de0fab0e763bfc6caf511c62716 100644
--- a/package/arm/config.default
+++ b/package/arm/config.default
@@ -3840,7 +3840,7 @@ CONFIG_DRM_AMD_DC=y
 # end of Display Engine Configuration
 
 # CONFIG_HSA_AMD is not set
-# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_UDL=m
diff --git a/package/default/config.default b/package/default/config.default
index edb2bc1d91d9ec8611e3b770786b710f81f1d2d7..858d11fc45f70b06e7828b54385227e096c3f0ec 100644
--- a/package/default/config.default
+++ b/package/default/config.default
@@ -3237,16 +3237,26 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 #
 # end of ARM devices
 
-# CONFIG_DRM_RADEON is not set
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
 # CONFIG_ARCH_PHYTIUM_1500A_MEM_TYPE_DEVICE is not set
-# CONFIG_DRM_AMDGPU is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+# CONFIG_DRM_AMDGPU_USERPTR is not set
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
 #
 # end of ACP (Audio CoProcessor) Configuration
 
-# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_ALPHA_SUPPORT is not set
 CONFIG_DRM_I915_FORCE_PROBE=""
@@ -3279,11 +3289,11 @@ CONFIG_DRM_I915_SPIN_REQUEST=5
 
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_VMWGFX is not set
+CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_GMA500 is not set
 # CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_SHMEM_HELPER=m
 CONFIG_DRM_CIRRUS_QEMU=m
@@ -3309,7 +3319,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 
 # CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_VBOXVIDEO is not set
+CONFIG_DRM_VBOXVIDEO=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
@@ -3896,7 +3906,10 @@ CONFIG_VIRTIO_MMIO=y
 #
 # Microsoft Hyper-V guest support
 #
-# CONFIG_HYPERV is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
 # end of Microsoft Hyper-V guest support
 
 # CONFIG_GREYBUS is not set
diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
index 794a375dad3601e26f870edfa75b3458f1341aa8..b2aec04fce8f674e61eddf6e4820b738f4d4c7e3 100644
--- a/tools/lib/subcmd/subcmd-util.h
+++ b/tools/lib/subcmd/subcmd-util.h
@@ -50,15 +50,8 @@ static NORETURN inline void die(const char *err, ...)
 static inline void *xrealloc(void *ptr, size_t size)
 {
 	void *ret = realloc(ptr, size);
-	if (!ret && !size)
-		ret = realloc(ptr, 1);
-	if (!ret) {
-		ret = realloc(ptr, size);
-		if (!ret && !size)
-			ret = realloc(ptr, 1);
-		if (!ret)
-			die("Out of memory, realloc failed");
-	}
+	if (!ret)
+		die("Out of memory, realloc failed");
 	return ret;
 }