Commit 67936911 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:
 "Nothing major in here - lots of good cleanups and tech debt handling,
  which is also evident in the diffstats. In particular:

   - Add disk sequence numbers (Matteo)

   - Discard merge fix (Ming)

   - Relax disk zoned reporting restrictions (Niklas)

   - Bio error handling zoned leak fix (Pavel)

   - Start of proper add_disk() error handling (Luis, Christoph)

   - blk crypto fix (Eric)

   - Non-standard GPT location support (Dmitry)

   - IO priority improvements and cleanups (Damien)o

   - blk-throtl improvements (Chunguang)

   - diskstats_show() stack reduction (Abd-Alrhman)

   - Loop scheduler selection (Bart)

   - Switch block layer to use kmap_local_page() (Christoph)

   - Remove obsolete disk_name helper (Christoph)

   - block_device refcounting improvements (Christoph)

   - Ensure gendisk always has a request queue reference (Christoph)

   - Misc fixes/cleanups (Shaokun, Oliver, Guoqing)"

* tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block: (129 commits)
  sg: pass the device name to blk_trace_setup
  block, bfq: cleanup the repeated declaration
  blk-crypto: fix check for too-large dun_bytes
  blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
  blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
  block: mark blkdev_fsync static
  block: refine the disk_live check in del_gendisk
  mmc: sdhci-tegra: Enable MMC_CAP2_ALT_GPT_TEGRA
  mmc: block: Support alternative_gpt_sector() operation
  partitions/efi: Support non-standard GPT location
  block: Add alternative_gpt_sector() operation
  bio: fix page leak bio_add_hw_page failure
  block: remove CONFIG_DEBUG_BLOCK_EXT_DEVT
  block: remove a pointless call to MINOR() in device_add_disk
  null_blk: add error handling support for add_disk()
  virtio_blk: add error handling support for add_disk()
  block: add error handling for device_add_disk / add_disk
  block: return errors from disk_alloc_events
  block: return errors from blk_integrity_add
  block: call blk_register_queue earlier in device_add_disk
  ...
parents 8596e589 1d1cf156

Documentation/ABI/testing/sysfs-block

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,18 @@ Description: 
		For more details refer Documentation/admin-guide/iostats.rst





What:		/sys/block/<disk>/diskseq

Date:		February 2021

Contact:	Matteo Croce <mcroce@microsoft.com>

Description:

		The /sys/block/<disk>/diskseq files reports the disk

		sequence number, which is a monotonically increasing

		number assigned to every drive.

		Some devices, like the loop device, refresh such number

		every time the backing file is changed.

		The value type is 64 bit unsigned.





What:		/sys/block/<disk>/<part>/stat

Date:		February 2008

Contact:	Jerome Marchand <jmarchan@redhat.com>

arch/m68k/configs/stmark2_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ CONFIG_RAMSIZE=0x8000000 
CONFIG_VECTORBASE=0x40000000

CONFIG_KERNELBASE=0x40001000

# CONFIG_BLK_DEV_BSG is not set

CONFIG_BLK_CMDLINE_PARSER=y

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_BINFMT_MISC=y

arch/mips/include/asm/mach-rc32434/rb.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 
#ifndef __ASM_RC32434_RB_H

#define __ASM_RC32434_RB_H



#include <linux/genhd.h>



#define REGBASE		0x18000000

#define IDT434_REG_BASE ((volatile void *) KSEG1ADDR(REGBASE))

#define UART0BASE	0x58000

arch/riscv/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ CONFIG_DEBUG_PLIST=y 
CONFIG_DEBUG_SG=y

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_EQS_DEBUG=y

CONFIG_DEBUG_BLOCK_EXT_DEVT=y

# CONFIG_FTRACE is not set

# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_MEMTEST=y

arch/riscv/configs/rv32_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ CONFIG_DEBUG_PLIST=y 
CONFIG_DEBUG_SG=y

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_EQS_DEBUG=y

CONFIG_DEBUG_BLOCK_EXT_DEVT=y

# CONFIG_FTRACE is not set

# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_MEMTEST=y