]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdc60e94f4f45837e0c2b8f3d5c4f77cfa47f5957
tree7cc982375122242b71036c8b8154d972da1b84f7
parent9b2544d8b294822f21a2789b2bee6985f3b64ef1
parent08aafa0d475a08e31a13403e9df41c7179f4bdcd
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