From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jun 2022 06:59:23 +0000 (+0200)
Subject: Merge 5.19-rc3 into staging-next
X-Git-Tag: howlett/maple/20220816~201^2~121
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8f4118f4297f93e82ebcf4dd1eb6e48fead592e;p=users%2Fjedix%2Flinux-maple.git

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>
---

e8f4118f4297f93e82ebcf4dd1eb6e48fead592e