ublk: fix maple tree lockdep warning and cleanup

[blktests-ci]

Pull request for series with
subject: ublk: fix maple tree lockdep warning and cleanup
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1084496

[blktests-ci]

Upstream branch: fb9d71c
series: https://patchwork.kernel.org/project/linux-block/list/?series=1084496
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: ublk: fix maple tree lockdep warning in ublk_buf_cleanup
Using index info to reconstruct a base tree...
M	drivers/block/ublk_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/ublk_drv.c
CONFLICT (content): Merge conflict in drivers/block/ublk_drv.c
Patch failed at 0001 ublk: fix maple tree lockdep warning in ublk_buf_cleanup'
  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 drivers/block/ublk_drv.c
index 8e5f3738c203,e8d71617fbda..000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -5531,7 -5465,31 +5531,35 @@@ static int ublk_ctrl_unreg_buf(struct u
  
  static void ublk_buf_cleanup(struct ublk_device *ub)
  {
++<<<<<<< HEAD
 +	ublk_shmem_remove_ranges(ub, -1);
++=======
+ 	MA_STATE(mas, &ub->buf_tree, 0, ULONG_MAX);
+ 	struct ublk_buf_range *range;
+ 	struct page *pages[32];
+ 
+ 	mas_lock(&mas);
+ 	mas_for_each(&mas, range, ULONG_MAX) {
+ 		unsigned long base = mas.index;
+ 		unsigned long nr = mas.last - base + 1;
+ 		unsigned long off;
+ 
+ 		mas_erase(&mas);
+ 
+ 		for (off = 0; off < nr; ) {
+ 			unsigned int batch = min_t(unsigned long,
+ 						   nr - off, 32);
+ 			unsigned int j;
+ 
+ 			for (j = 0; j < batch; j++)
+ 				pages[j] = pfn_to_page(base + off + j);
+ 			unpin_user_pages(pages, batch);
+ 			off += batch;
+ 		}
+ 		kfree(range);
+ 	}
+ 	mas_unlock(&mas);
++>>>>>>> ublk: fix maple tree lockdep warning in ublk_buf_cleanup
  	mtree_destroy(&ub->buf_tree);
  	ida_destroy(&ub->buf_ida);
  }