Commit 33c8846c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.16/block-2021-10-29' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:

 - mq-deadline accounting improvements (Bart)

 - blk-wbt timer fix (Andrea)

 - Untangle the block layer includes (Christoph)

 - Rework the poll support to be bio based, which will enable adding
   support for polling for bio based drivers (Christoph)

 - Block layer core support for multi-actuator drives (Damien)

 - blk-crypto improvements (Eric)

 - Batched tag allocation support (me)

 - Request completion batching support (me)

 - Plugging improvements (me)

 - Shared tag set improvements (John)

 - Concurrent queue quiesce support (Ming)

 - Cache bdev in ->private_data for block devices (Pavel)

 - bdev dio improvements (Pavel)

 - Block device invalidation and block size improvements (Xie)

 - Various cleanups, fixes, and improvements (Christoph, Jackie,
   Masahira, Tejun, Yu, Pavel, Zheng, me)

* tag 'for-5.16/block-2021-10-29' of git://git.kernel.dk/linux-block: (174 commits)
  blk-mq-debugfs: Show active requests per queue for shared tags
  block: improve readability of blk_mq_end_request_batch()
  virtio-blk: Use blk_validate_block_size() to validate block size
  loop: Use blk_validate_block_size() to validate block size
  nbd: Use blk_validate_block_size() to validate block size
  block: Add a helper to validate the block size
  block: re-flow blk_mq_rq_ctx_init()
  block: prefetch request to be initialized
  block: pass in blk_mq_tags to blk_mq_rq_ctx_init()
  block: add rq_flags to struct blk_mq_alloc_data
  block: add async version of bio_set_polled
  block: kill DIO_MULTI_BIO
  block: kill unused polling bits in __blkdev_direct_IO()
  block: avoid extra iter advance with async iocb
  block: Add independent access ranges support
  blk-mq: don't issue request directly in case that current is to be blocked
  sbitmap: silence data race warning
  blk-cgroup: synchronize blkg creation against policy deactivation
  block: refactor bio_iov_bvec_set()
  block: add single bio async direct IO helper
  ...
parents 9ac21142 9b84c629

Documentation/block/inline-encryption.rst

+245 −206

File changed.

Preview size limit exceeded, changes collapsed.

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,8 @@ export MODORDER := $(extmod_prefix)modules.order 
export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps



ifeq ($(KBUILD_EXTMOD),)

core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/

core-y			+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/

core-$(CONFIG_BLOCK)	+= block/



vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, \

		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

arch/m68k/emu/nfblock.c

+1 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct nfhd_device { 
	struct gendisk *disk;

};



static blk_qc_t nfhd_submit_bio(struct bio *bio)

static void nfhd_submit_bio(struct bio *bio)

{

	struct nfhd_device *dev = bio->bi_bdev->bd_disk->private_data;

	struct bio_vec bvec;
@@ -76,7 +76,6 @@ static blk_qc_t nfhd_submit_bio(struct bio *bio) 
		sec += len;

	}

	bio_endio(bio);

	return BLK_QC_T_NONE;

}



static int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo)

arch/mips/rb532/prom.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/console.h>

#include <linux/memblock.h>

#include <linux/ioport.h>

#include <linux/blkdev.h>



#include <asm/bootinfo.h>

#include <asm/mach-rc32434/ddr.h>

arch/mips/sibyte/common/cfe.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/kernel.h>

#include <linux/linkage.h>

#include <linux/mm.h>

#include <linux/blkdev.h>

#include <linux/memblock.h>

#include <linux/pm.h>

#include <linux/smp.h>