Merge branch 'char-misc-linus' into 'char-misc-next'
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jul 2020 11:42:33 +0000 (13:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jul 2020 11:42:33 +0000 (13:42 +0200)
commit2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f
tree2b56ba6dc8bfa65535fc2e70ed61f40a1cbefe15
parent415abcdfd4b8326d679cd0c78bee00b5ceac9718
parent59d1d2e8e1e7c50d2657d5e4812b53f71f507968
Merge branch 'char-misc-linus' into 'char-misc-next'

We need the virtbox changes in here as well to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_pdrv_genirq.c