Merge 647412daeb ("Merge tag 'mmc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline

Steps on the way to 5.10-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7ef0b81d31025e256bd85102013ed3ad038a54b1
This commit is contained in:
Greg Kroah-Hartman
2020-10-23 11:59:10 +02:00
170 changed files with 4746 additions and 2710 deletions

View File

@@ -3089,8 +3089,6 @@ enum {
DIO_SKIP_HOLES = 0x02,
};
void dio_end_io(struct bio *bio);
ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
struct block_device *bdev, struct iov_iter *iter,
get_block_t get_block,