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

Pull xen fixes from Juergen Gross:
 "One minor cleanup patch and a fix for handling of live migration when
  running as Xen guest"

* tag 'for-linus-5.2b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xenbus: Avoid deadlock during suspend due to open transactions
  xen/pvcalls: Remove set but not used variable

diff --combined drivers/xen/pvcalls-front.c
index c755499,d7438fd..57592a6
--- 1/drivers/xen/pvcalls-front.c
--- 2/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@@ -1,6 -1,15 +1,6 @@@
 +// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * (c) 2017 Stefano Stabellini <stefano@aporeto.com>
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
   */
  
  #include <linux/module.h>
@@@ -531,7 -540,6 +531,6 @@@ out
  int pvcalls_front_sendmsg(struct socket *sock, struct msghdr *msg,
                          size_t len)
  {
-       struct pvcalls_bedata *bedata;
        struct sock_mapping *map;
        int sent, tot_sent = 0;
        int count = 0, flags;
@@@ -543,7 -551,6 +542,6 @@@
        map = pvcalls_enter_sock(sock);
        if (IS_ERR(map))
                return PTR_ERR(map);
-       bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
  
        mutex_lock(&map->active.out_mutex);
        if ((flags & MSG_DONTWAIT) && !pvcalls_front_write_todo(map)) {
@@@ -626,7 -633,6 +624,6 @@@ out
  int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
                     int flags)
  {
-       struct pvcalls_bedata *bedata;
        int ret;
        struct sock_mapping *map;
  
@@@ -636,7 -642,6 +633,6 @@@
        map = pvcalls_enter_sock(sock);
        if (IS_ERR(map))
                return PTR_ERR(map);
-       bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
  
        mutex_lock(&map->active.in_mutex);
        if (len > XEN_FLEX_RING_SIZE(PVCALLS_RING_ORDER))