diff --git a/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch b/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch index fda8168694..b9be9cff19 100644 --- a/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch +++ b/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch @@ -9,10 +9,10 @@ Signed-off-by: graysky 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index ee36fa8be3af..049bdca2655c 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -193,9 +193,8 @@ static int c_show(struct seq_file *m, void *v) +@@ -211,9 +211,8 @@ static int c_show(struct seq_file *m, void *v) * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); diff --git a/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch b/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch index 39ef8d9e3a..63228388d9 100644 --- a/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch +++ b/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch @@ -29,10 +29,10 @@ Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) 3 files changed, 88 insertions(+) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index 8b15742d9e8a..a7d997a205d5 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c -@@ -4763,6 +4763,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp +@@ -4775,6 +4775,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp spin_unlock_irqrestore(&hsotg->lock, flags); } @@ -111,7 +111,7 @@ index 8b15742d9e8a..a7d997a205d5 100644 static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { .get_frame = dwc2_hsotg_gadget_getframe, .set_selfpowered = dwc2_hsotg_set_selfpowered, -@@ -4772,6 +4844,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { +@@ -4784,6 +4856,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { .udc_set_speed = dwc2_gadget_set_speed, .vbus_session = dwc2_hsotg_vbus_session, .vbus_draw = dwc2_hsotg_vbus_draw, @@ -120,7 +120,7 @@ index 8b15742d9e8a..a7d997a205d5 100644 /** diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index ea85e2c701a1..846942e4275a 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c @@ -58,6 +58,8 @@ struct f_hidg { @@ -132,7 +132,7 @@ index ea85e2c701a1..846942e4275a 100644 /* recv report */ spinlock_t read_spinlock; -@@ -434,10 +436,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, +@@ -435,10 +437,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, size_t count, loff_t *offp) { struct f_hidg *hidg = file->private_data; @@ -152,7 +152,7 @@ index ea85e2c701a1..846942e4275a 100644 spin_lock_irqsave(&hidg->write_spinlock, flags); if (!hidg->req) { -@@ -1101,6 +1112,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) +@@ -1102,6 +1113,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) F_HID_OPT(subclass, 8, 255); F_HID_OPT(protocol, 8, 255); F_HID_OPT(no_out_endpoint, 8, 1); @@ -160,7 +160,7 @@ index ea85e2c701a1..846942e4275a 100644 F_HID_OPT(report_length, 16, 65535); static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) -@@ -1161,6 +1173,7 @@ static struct configfs_attribute *hid_attrs[] = { +@@ -1162,6 +1174,7 @@ static struct configfs_attribute *hid_attrs[] = { &f_hid_opts_attr_subclass, &f_hid_opts_attr_protocol, &f_hid_opts_attr_no_out_endpoint, @@ -168,7 +168,7 @@ index ea85e2c701a1..846942e4275a 100644 &f_hid_opts_attr_report_length, &f_hid_opts_attr_report_desc, &f_hid_opts_attr_dev, -@@ -1296,6 +1309,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) +@@ -1297,6 +1310,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) } } hidg->use_out_ep = !opts->no_out_endpoint; @@ -177,7 +177,7 @@ index ea85e2c701a1..846942e4275a 100644 ++opts->refcnt; mutex_unlock(&opts->lock); diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h -index 84bb70292855..f7fcaf1eaf1d 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/u_hid.h +++ b/drivers/usb/gadget/function/u_hid.h @@ -21,6 +21,7 @@ struct f_hid_opts { diff --git a/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch b/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch index 1714836d0d..277f494b2d 100644 --- a/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch +++ b/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch @@ -27,10 +27,10 @@ Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index da07e45ae6df..723d70766a49 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2967,11 +2967,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, +@@ -2983,11 +2983,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, /* Prepare inquiryString */ i = get_default_bcdDevice(); snprintf(common->inquiry_string, sizeof(common->inquiry_string),