From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Sep 2021 14:45:36 +0000 (+0200)
Subject: Merge branch 5.15-rc3 into staging-next
X-Git-Tag: v6.1-rc5~2729^2~305
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b40e16ee51a0e9255cd2571c76b1c8a0b504c74;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 5.15-rc3 into staging-next

We need the fixes in here, and it resolves a 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>
---

9b40e16ee51a0e9255cd2571c76b1c8a0b504c74