From: Greg Kroah-Hartman Date: Wed, 9 Oct 2024 09:25:27 +0000 (+0200) Subject: Merge wireless-next into staging-next X-Git-Tag: v6.13-rc1~30^2~216 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2d2547783444a8c18d8c35a7ceffea85b02b0f6;p=thirdparty%2Flinux.git Merge wireless-next into staging-next This merges up to commit a0efa2f362a6 ("Merge net-next/main to resolve conflicts") from wireless-next into the staging-next branch to handle the removal of a staging driver easier (it happened in the wireless-next branch). That way we don't have developers confused and start submitting changes for this driver that is now deleted. Signed-off-by: Greg Kroah-Hartman --- c2d2547783444a8c18d8c35a7ceffea85b02b0f6