aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2019-12-22 10:36:55 -0800
committerLinus Torvalds2019-12-22 10:36:55 -0800
commit44579f35c2d90dfac5ea27308261318c7750e9b5 (patch)
treedabb1d27158bec07699c86bba5a66e6354bcd058 /fs/ext4/Makefile
parenta313c8e056f86d13ae95a4aef30715918efff20f (diff)
parentdf034c93f15ee71df231ff9fe311d27ff08a2a52 (diff)
Merge tag 'block-5.5-20191221' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Let's try this one again, this time without the compat_ioctl changes. We've got those fixed up, but that can go out next week. This contains: - block queue flush lockdep annotation (Bart) - Type fix for bsg_queue_rq() (Bart) - Three dasd fixes (Stefan, Jan) - nbd deadlock fix (Mike) - Error handling bio user map fix (Yang) - iocost fix (Tejun) - sbitmap waitqueue addition fix that affects the kyber IO scheduler (David)" * tag 'block-5.5-20191221' of git://git.kernel.dk/linux-block: sbitmap: only queue kyber's wait callback if not already active block: fix memleak when __blk_rq_map_user_iov() is failed s390/dasd: fix typo in copyright statement s390/dasd: fix memleak in path handling error case s390/dasd/cio: Interpret ccw_device_get_mdc return value correctly block: Fix a lockdep complaint triggered by request queue flushing block: Fix the type of 'sts' in bsg_queue_rq() block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT nbd: fix shutdown and recv work deadlock v2 iocost: over-budget forced IOs should schedule async delay
Diffstat (limited to 'fs/ext4/Makefile')
0 files changed, 0 insertions, 0 deletions