Merge 6.0-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 05:57:37 +0000 (07:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2022 05:57:37 +0000 (07:57 +0200)
commit28a2a54901f66a45ab339e944fdfc69667e639c1
treebe3c7425926f1819085cc989dff2c97a6ddbf0d0
parent7bd581f3c26354f5d5dc6536fcfbbe14f4f5b2b7
parent7e18e42e4b280c85b76967a9106a13ca61c16179
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>
drivers/staging/r8188eu/os_dep/usb_intf.c