mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
kernel: bump 6.1 to 6.1.8 (#10802)
Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
This commit is contained in:
parent
02d584f972
commit
0a113ed61b
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .7
|
LINUX_VERSION-6.1 = .8
|
||||||
LINUX_KERNEL_HASH-6.1.7 = 4ab048bad2e7380d3b827f1fad5ad2d2fc4f2e80e1c604d85d1f8781debe600f
|
LINUX_KERNEL_HASH-6.1.8 = b60bb53ab8ba370a270454b11e93d41af29126fc72bd6ede517673e2e57b816d
|
||||||
|
@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||||||
|
|
||||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||||
/* These Quectel products use Quectel's vendor ID */
|
/* These Quectel products use Quectel's vendor ID */
|
||||||
@@ -1156,6 +1158,11 @@ static const struct usb_device_id option
|
@@ -1162,6 +1164,11 @@ static const struct usb_device_id option
|
||||||
.driver_info = ZLP },
|
.driver_info = ZLP },
|
||||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||||
.driver_info = RSVD(4) },
|
.driver_info = RSVD(4) },
|
||||||
|
@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
||||||
--- a/drivers/dma-buf/dma-buf.c
|
--- a/drivers/dma-buf/dma-buf.c
|
||||||
+++ b/drivers/dma-buf/dma-buf.c
|
+++ b/drivers/dma-buf/dma-buf.c
|
||||||
@@ -1589,4 +1589,5 @@ static void __exit dma_buf_deinit(void)
|
@@ -1583,4 +1583,5 @@ static void __exit dma_buf_deinit(void)
|
||||||
kern_unmount(dma_buf_mnt);
|
kern_unmount(dma_buf_mnt);
|
||||||
dma_buf_uninit_sysfs_statistics();
|
dma_buf_uninit_sysfs_statistics();
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH] of/ftd: add device tree cmdline
|
|||||||
|
|
||||||
--- a/drivers/of/fdt.c
|
--- a/drivers/of/fdt.c
|
||||||
+++ b/drivers/of/fdt.c
|
+++ b/drivers/of/fdt.c
|
||||||
@@ -1174,6 +1174,9 @@ int __init early_init_dt_scan_chosen(cha
|
@@ -1187,6 +1187,9 @@ int __init early_init_dt_scan_chosen(cha
|
||||||
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
||||||
if (p != NULL && l > 0)
|
if (p != NULL && l > 0)
|
||||||
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
|
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
|
||||||
@ -17,5 +17,5 @@ Subject: [PATCH] of/ftd: add device tree cmdline
|
|||||||
+ if (p != NULL && l > 0)
|
+ if (p != NULL && l > 0)
|
||||||
+ strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
|
+ strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
|
||||||
|
|
||||||
|
handle_cmdline:
|
||||||
/*
|
/*
|
||||||
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
|
||||||
|
@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -13949,6 +13949,7 @@ F: include/uapi/linux/meye.h
|
@@ -13951,6 +13951,7 @@ F: include/uapi/linux/meye.h
|
||||||
|
|
||||||
MOTORCOMM PHY DRIVER
|
MOTORCOMM PHY DRIVER
|
||||||
M: Peter Geis <pgwipeout@gmail.com>
|
M: Peter Geis <pgwipeout@gmail.com>
|
||||||
|
Loading…
Reference in New Issue
Block a user