Merge branch 5.15-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Sep 2021 14:45:36 +0000 (16:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Sep 2021 14:45:36 +0000 (16:45 +0200)
commit9b40e16ee51a0e9255cd2571c76b1c8a0b504c74
treefc2226242e187d1827398bd527b9a795e3458ff9
parentc34e73d67c82a9f13c45627e7ba7e0006c26abb7
parent5816b3e6577eaa676ceb00a848f0fd65fe2adc29
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>