Merge tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull more xen updates from Juergen Gross:

 - a patch to fix a build warning

 - a cleanup of no longer needed code in the Xen event handling

 - a small series for the Xen grant driver avoiding high order
   allocations and replacing an insane global limit by a per-call one

 - a small series fixing Xen frontend/backend module referencing

* tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkback: allow module to be cleanly unloaded
  xen/xenbus: reference count registered modules
  xen/gntdev: switch from kcalloc() to kvcalloc()
  xen/gntdev: replace global limit of mapped pages by limit per call
  xen/gntdev: remove redundant non-zero check on ret
  xen/events: remove event handling recursion detection

diff --combined drivers/block/xen-blkback/blkback.c
index 3666afa639d1a1c2509d5e14835d75a5759bdb41,e562a7e20c3c0cd94ad48624a5c20c9220701052..716b99aa230770f0816969a7a163aa3de6a2674c
--- 1/drivers/block/xen-blkback/blkback.c
--- 2/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@@ -936,8 -936,6 +936,8 @@@ next
  out_of_memory:
        pr_alert("%s: out of memory\n", __func__);
        put_free_pages(ring, pages_to_gnt, segs_to_map);
 +      for (i = last_map; i < num; i++)
 +              pages[i]->handle = BLKBACK_INVALID_HANDLE;
        return -ENOMEM;
  }
  
@@@ -1506,5 -1504,13 +1506,13 @@@ static int __init xen_blkif_init(void
  
  module_init(xen_blkif_init);
  
+ static void __exit xen_blkif_fini(void)
+ {
+       xen_blkif_xenbus_fini();
+       xen_blkif_interface_fini();
+ }
+ 
+ module_exit(xen_blkif_fini);
+ 
  MODULE_LICENSE("Dual BSD/GPL");
  MODULE_ALIAS("xen-backend:vbd");