From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 Sep 2022 05:57:37 +0000 (+0200)
Subject: Merge 6.0-rc4 into staging-next
X-Git-Tag: v6.1-rc1~112^2~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28a2a54901f66a45ab339e944fdfc69667e639c1;p=thirdparty%2Flinux.git

Merge 6.0-rc4 into staging-next

Resolves the merge issue with:
	drivers/staging/r8188eu/os_dep/os_intfs.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

28a2a54901f66a45ab339e944fdfc69667e639c1