Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 5.15 to 5.15.62 #9994

Merged
merged 1 commit into from
Aug 25, 2022
Merged

kernel: bump 5.15 to 5.15.62 #9994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-5.15
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .60
LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a
LINUX_VERSION-5.15 = .62
LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>

#include "gpiolib.h"
#include "gpiolib-of.h"
@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
else
gc->of_node = gdev->dev.of_node;
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.15/904-debloat_dma_buf.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4175,6 +4175,7 @@ int wake_up_state(struct task_struct *p,
@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.15/420-mtd-redboot_space.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
@@ -277,14 +277,21 @@ nogood:
@@ -278,14 +278,21 @@ nogood:
#endif
names += strlen(names) + 1;

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_
@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-5.15/920-mangle_bootargs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
help
--- a/init/main.c
+++ b/init/main.c
@@ -615,6 +615,29 @@ static inline void setup_nr_cpu_ids(void
@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif

Expand Down Expand Up @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa
@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -83,6 +83,7 @@ struct serial8250_config {
@@ -85,6 +85,7 @@ struct serial8250_config {
#define UART_CAP_MINI BIT(17) /* Mini UART on BCM283X family lacks:
* STOP PARITY EPAR SPAR WLEN5 WLEN6
*/
Expand All @@ -19,7 +19,7 @@
},
[PORT_NPCM] = {
.name = "Nuvoton 16550",
@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po
@@ -2745,6 +2745,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags;
unsigned int baud, quot, frac = 0;

Expand Down