aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-05-30 12:17:13 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-03 11:42:00 +0200
commite2701e0f33980f7fd46d7b09daf29737e15bb071 (patch)
treeb48fd1eebb5884995f0675e1af041f71448cd540
parentf949dd5c906fc36d74d86d39fb9c4d514eea57d6 (diff)
downloadupstream-e2701e0f33980f7fd46d7b09daf29737e15bb071.tar.gz
upstream-e2701e0f33980f7fd46d7b09daf29737e15bb071.tar.bz2
upstream-e2701e0f33980f7fd46d7b09daf29737e15bb071.zip
kernel: bump 5.15 to 5.15.114
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 223004b4d6e5d17c0ae99e15d0f4c591676b4f44)
-rw-r--r--include/kernel-5.154
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 733a8edf78..4c18bc35c2 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .113
-LINUX_KERNEL_HASH-5.15.113 = 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca
+LINUX_VERSION-5.15 = .114
+LINUX_KERNEL_HASH-5.15.114 = e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2
diff --git a/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
index 857221d8b5..68c2c6d728 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
@@ -70,7 +70,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
* @dev: the device whose endpoint is being disabled
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -1845,6 +1845,8 @@ extern int usb_clear_halt(struct usb_dev
+@@ -1850,6 +1850,8 @@ extern int usb_clear_halt(struct usb_dev
extern int usb_reset_configuration(struct usb_device *dev);
extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr);