Merge tag 'v5.7-rc4' into core (ec9b40cf) · Commits · 戴 / test

Documentation/admin-guide/device-mapper/dm-integrity.rst

+9 −6

Original line number	Diff line number	Diff line
		@@ -182,12 +182,15 @@ fix_padding
		space-efficient. If this option is not present, large padding is
		used - that is for compatibility with older kernels.


		The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can
		be changed when reloading the target (load an inactive table and swap the
		tables with suspend and resume). The other arguments should not be changed
		when reloading the target because the layout of disk data depend on them
		and the reloaded target would be non-functional.
		allow_discards
		Allow block discard requests (a.k.a. TRIM) for the integrity device.
		Discards are only allowed to devices using internal hash.

		The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and
		allow_discards can be changed when reloading the target (load an inactive
		table and swap the tables with suspend and resume). The other arguments
		should not be changed when reloading the target because the layout of disk
		data depend on them and the reloaded target would be non-functional.


		The layout of the formatted block device:

+3 −4

Original line number	Diff line number	Diff line
		@@ -22,9 +22,7 @@ properties:
		const: socionext,uniphier-xdmac

		reg:
		items:
		- description: XDMAC base register region (offset and length)
		- description: XDMAC extension register region (offset and length)
		maxItems: 1

		interrupts:
		maxItems: 1
		@@ -49,12 +47,13 @@ required:
		- reg
		- interrupts
		- "#dma-cells"
		- dma-channels

		examples:
		- \|
		xdmac: dma-controller@5fc10000 {
		compatible = "socionext,uniphier-xdmac";
		reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;
		reg = <0x5fc10000 0x5300>;
		interrupts = <0 188 4>;
		#dma-cells = <2>;
		dma-channels = <16>;

+1 −1

Original line number	Diff line number	Diff line
		@@ -3657,7 +3657,7 @@ L: linux-btrfs@vger.kernel.org
		S: Maintained
		W: http://btrfs.wiki.kernel.org/
		Q: http://patchwork.kernel.org/project/linux-btrfs/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
		F: Documentation/filesystems/btrfs.rst
		F: fs/btrfs/
		F: include/linux/btrfs*

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ UBSAN_SANITIZE := n
		OBJECT_FILES_NON_STANDARD := y
		KCOV_INSTRUMENT := n

		CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny
		CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables

		ifneq ($(c-gettimeofday-y),)
		CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)