From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Dec 2025 18:49:19 +0000 (-0800)
Subject: Merge tag 'for-linus-6.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.19-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a68aefc710a9f5486c90c87f0424d4912429adb;p=thirdparty%2Fkernel%2Flinux.git

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()
---

1a68aefc710a9f5486c90c87f0424d4912429adb
diff --cc drivers/xen/xenbus/xenbus_xs.c
index f794014814bea,bddc714877c1a..15f18374020ea
--- 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;