Skip to content

Commit 07df792

Browse files
misaka36graysky2
andauthored
kernel: bump 6.0 to 6.0.10 (#10505)
Manually rebase: pending-6.0/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch All other patches automatically rebased Co-authored-by: John Audia <[email protected]> Signed-off-by: Liu Linhui <[email protected]> Signed-off-by: Liu Linhui <[email protected]> Co-authored-by: John Audia <[email protected]>
1 parent e787ad1 commit 07df792

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

include/kernel-6.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.0 = .9
2-
LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
1+
LINUX_VERSION-6.0 = .10
2+
LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0

target/linux/generic/hack-6.0/780-usb-net-MeigLink_modem_support.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
1111
--- a/drivers/usb/serial/option.c
1212
+++ b/drivers/usb/serial/option.c
13-
@@ -243,6 +243,8 @@ static void option_instat_callback(struc
14-
#define UBLOX_PRODUCT_R6XX 0x90fa
13+
@@ -244,6 +244,8 @@ static void option_instat_callback(struc
14+
#define UBLOX_PRODUCT_R410M 0x90b2
1515
/* These Yuga products use Qualcomm's vendor ID */
1616
#define YUGA_PRODUCT_CLM920_NC5 0x9625
1717
+/* These MeigLink products use Qualcomm's vendor ID */
1818
+#define MEIGLINK_PRODUCT_SLM750 0xf601
1919

2020
#define QUECTEL_VENDOR_ID 0x2c7c
2121
/* These Quectel products use Quectel's vendor ID */
22-
@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
22+
@@ -1155,6 +1157,11 @@ static const struct usb_device_id option
2323
.driver_info = ZLP },
2424
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
2525
.driver_info = RSVD(4) },

target/linux/generic/hack-6.0/992-add-ndo-do-ioctl.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/wireless/wext-core.c
22
+++ b/net/wireless/wext-core.c
3-
@@ -956,6 +956,9 @@ static int wireless_process_ioctl(struct
3+
@@ -959,6 +959,9 @@ static int wireless_process_ioctl(struct
44
else if (private)
55
return private(dev, iwr, cmd, info, handler);
66
}

target/linux/generic/pending-6.0/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ Signed-off-by: Yousong Zhou <[email protected]>
238238
+#endif
239239
--- a/arch/mips/kernel/relocate_kernel.S
240240
+++ b/arch/mips/kernel/relocate_kernel.S
241-
@@ -10,10 +10,12 @@
241+
@@ -10,10 +10,11 @@
242242
#include <asm/mipsregs.h>
243243
#include <asm/stackframe.h>
244244
#include <asm/addrspace.h>
@@ -248,11 +248,10 @@ Signed-off-by: Yousong Zhou <[email protected]>
248248

249249
-LEAF(relocate_new_kernel)
250250
+LEAF(kexec_relocate_new_kernel)
251-
+
252251
PTR_L a0, arg0
253252
PTR_L a1, arg1
254253
PTR_L a2, arg2
255-
@@ -98,7 +100,7 @@ done:
254+
@@ -98,7 +99,7 @@ done:
256255
#endif
257256
/* jump to kexec_start_address */
258257
j s1
@@ -261,23 +260,22 @@ Signed-off-by: Yousong Zhou <[email protected]>
261260

262261
#ifdef CONFIG_SMP
263262
/*
264-
@@ -181,9 +183,15 @@ kexec_indirection_page:
263+
@@ -177,8 +178,15 @@ EXPORT(kexec_indirection_page)
265264
PTR_WD 0
266265
.size kexec_indirection_page, PTRSIZE
267266

268267
-relocate_new_kernel_end:
269268
+kexec_argv_buf:
270269
+ EXPORT(kexec_argv_buf)
271-
+ .skip KEXEC_COMMAND_LINE_SIZE
272-
+ .size kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
270+
+ .skip KEXEC_COMMAND_LINE_SIZE
271+
+ .size kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE
273272
+
274273
+kexec_argv:
275274
+ EXPORT(kexec_argv)
276-
+ .skip KEXEC_ARGV_SIZE
277-
+ .size kexec_argv, KEXEC_ARGV_SIZE
275+
+ .skip KEXEC_ARGV_SIZE
276+
+ .size kexec_argv, KEXEC_ARGV_SIZE
278277

279-
-relocate_new_kernel_size:
280-
- EXPORT(relocate_new_kernel_size)
278+
-EXPORT(relocate_new_kernel_size)
281279
- PTR_WD relocate_new_kernel_end - relocate_new_kernel
282280
- .size relocate_new_kernel_size, PTRSIZE
283281
+kexec_relocate_new_kernel_end:

target/linux/rockchip/patches-6.0/107-mmc-core-set-initial-signal-voltage-on-power-off.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <[email protected]>
2424

2525
--- a/drivers/mmc/core/core.c
2626
+++ b/drivers/mmc/core/core.c
27-
@@ -1360,6 +1360,8 @@ void mmc_power_off(struct mmc_host *host
27+
@@ -1366,6 +1366,8 @@ void mmc_power_off(struct mmc_host *host
2828

2929
mmc_pwrseq_power_off(host);
3030

0 commit comments

Comments
 (0)