tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge e7e9423db4 ("Merge tag 'v6.6-vfs.super.fixes.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs") into android-mainline

Browse Source 
Steps on the way to 6.6-rc1

Resolves merge conflict in:
	drivers/dma-buf/heaps/system_heap.c

Change-Id: I48f2f1ef6f3caa51f220705c3c53be266e0dcefc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-11 20:30:45 +00:00
parent 64b2882505 e7e9423db4
commit ea2c5c741f
5561 changed files with 156003 additions and 61734 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/block/data-integrity.rst
+1 -1
View File
@@ -209,7 +209,7 @@ will require extra work due to the application tag.
sector must be set, and the bio should have all data pages
added. It is up to the caller to ensure that the bio does not
change while I/O is in progress.
Complete bio with error if prepare failed for some reson.
Complete bio with error if prepare failed for some reason.
5.3 Passing Existing Integrity Metadata
Documentation/block/ublk.rst
+1 -1
View File
@@ -238,7 +238,7 @@ The's IO is assigned by a unique tag, which is 1:1 mapping with IO
request of ``/dev/ublkb*``.
UAPI structure of ``ublksrv_io_desc`` is defined for describing each IO from
the driver. A fixed mmaped area (array) on ``/dev/ublkc*`` is provided for
the driver. A fixed mmapped area (array) on ``/dev/ublkc*`` is provided for
exporting IO info to the server; such as IO offset, length, OP/flags and
buffer address. Each ``ublksrv_io_desc`` instance can be indexed via queue id
and IO tag directly.