From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 23 Apr 2024 11:29:17 +0000 (+0200)
Subject: Merge 6.9-rc5 into usb-next
X-Git-Tag: v6.10-rc1~48^2~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d31ea587709216d88183fe4ca0c8aba5e0205b8;p=thirdparty%2Fkernel%2Flinux.git

Merge 6.9-rc5 into usb-next

We need the usb/thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

0d31ea587709216d88183fe4ca0c8aba5e0205b8
diff --cc drivers/usb/gadget/function/f_fs.c
index d3a7f7bae07b0,f855f1fc8e5e1..8710e32b4949e
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@@ -45,8 -45,9 +45,10 @@@
  #include "configfs.h"
  
  #define FUNCTIONFS_MAGIC	0xa647361 /* Chosen by a honest dice roll ;) */
 +#define MAX_ALT_SETTINGS	2		  /* Allow up to 2 alt settings to be set. */
  
+ #define DMABUF_ENQUEUE_TIMEOUT_MS 5000
+ 
  MODULE_IMPORT_NS(DMA_BUF);
  
  /* Reference counter handling */