Merge 5.19-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2022 06:59:23 +0000 (08:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2022 06:59:23 +0000 (08:59 +0200)
commite8f4118f4297f93e82ebcf4dd1eb6e48fead592e
tree7cc982375122242b71036c8b8154d972da1b84f7
parentde9257ae1d3b0d8856955045d194e3ff4f278394
parenta111daf0c53ae91e71fd2bfe7497862d14132e3e
Merge 5.19-rc3 into staging-next

This resolves the merge issue with:
drivers/staging/r8188eu/os_dep/ioctl_linux.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/r8188eu/os_dep/ioctl_linux.c