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

Pull xen updates from Juergen Gross:
 "This round it contains only three small cleanup patches"

* tag 'for-linus-6.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  drivers/xen: use min() instead of min_t()
  drivers/xen/xenbus: Replace deprecated strcpy in xenbus_transaction_end
  drivers/xen/xenbus: Simplify return statement in join()

diff --cc drivers/xen/xenbus/xenbus_xs.c
index f794014814bea832d6be2ffa281837b3de3e7aae,bddc714877c1a5b54c52b8221219bb396a4610b3..15f18374020eafb239afefedef94c830e7ff6962
--- 1/drivers/xen/xenbus/xenbus_xs.c
--- 2/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@@ -407,10 -407,10 +407,10 @@@ static char *join(const char *dir, cons
                buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s", dir);
        else
                buffer = kasprintf(GFP_NOIO | __GFP_HIGH, "%s/%s", dir, name);
-       return (!buffer) ? ERR_PTR(-ENOMEM) : buffer;
+       return buffer ?: ERR_PTR(-ENOMEM);
  }
  
 -static char **split(char *strings, unsigned int len, unsigned int *num)
 +static char **split_strings(char *strings, unsigned int len, unsigned int *num)
  {
        char *p, **ret;