ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)

[blktests-ci]

Pull request for series with
subject: ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=969822

[blktests-ci]

Upstream branch: 19272b3
series: https://patchwork.kernel.org/project/linux-block/list/?series=969822
version: 1

[blktests-ci]

Upstream branch: 8c2e52e
series: https://patchwork.kernel.org/project/linux-block/list/?series=970718
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=970718
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)
Using index info to reconstruct a base tree...
M	Documentation/block/ublk.rst
Falling back to patching base and 3-way merge...
Auto-merging Documentation/block/ublk.rst
CONFLICT (content): Merge conflict in Documentation/block/ublk.rst
Patch failed at 0001 ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc Documentation/block/ublk.rst
index 8c4030bcabb6,abec524a04ed..000000000000
--- a/Documentation/block/ublk.rst
+++ b/Documentation/block/ublk.rst
@@@ -408,7 -408,6 +408,10 @@@ Fallback Behavio
  If auto buffer registration fails:
  
  1. When ``UBLK_AUTO_BUF_REG_FALLBACK`` is enabled:
++<<<<<<< HEAD
 +
++=======
++>>>>>>> ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)
     - The uring_cmd is completed
     - ``UBLK_IO_F_NEED_REG_BUF`` is set in ``ublksrv_io_desc.op_flags``
     - The ublk server must manually deal with the failure, such as, register
@@@ -416,7 -415,6 +419,10 @@@
       for handling ublk IO
  
  2. If fallback is not enabled:
++<<<<<<< HEAD
 +
++=======
++>>>>>>> ublk: document auto buffer registration(UBLK_F_AUTO_BUF_REG)
     - The ublk I/O request fails silently
     - The uring_cmd won't be completed
  

[blktests-ci]

At least one diff in series https://patchwork.kernel.org/project/linux-block/list/?series=969822 irrelevant now for [{'archived': False, 'project': 241}] search patterns