Commit 1a68aefc710a for kernel

commit 1a68aefc710a9f5486c90c87f0424d4912429adb
Merge: 249872f53d64 150215b89bcf
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Dec 6 10:49:19 2025 -0800

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

    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 f794014814be,bddc714877c1..15f18374020e
--- a/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;