diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-09-30 14:21:41 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-09-30 22:29:33 +0100 |
| commit | b4cee3b63ff042b394f9bb3e0d8c39b7f6707dfa (patch) | |
| tree | 5ba5ce1681ccb721347c0c6a1aa7246aecd5e63e /target/linux/generic | |
| parent | 2bf320a5e51a3dec733ab75b4d8085655c7f5ba6 (diff) | |
| download | upstream-b4cee3b63ff042b394f9bb3e0d8c39b7f6707dfa.tar.gz upstream-b4cee3b63ff042b394f9bb3e0d8c39b7f6707dfa.tar.bz2 upstream-b4cee3b63ff042b394f9bb3e0d8c39b7f6707dfa.zip | |
kernel: bump 5.10 to 5.10.70
Deleted (upstreamed):
bcm53xx/patches-5.10/181-Revert-USB-bcma-Add-a-check-for-devm_gpiod_get.patch
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/pending-5.10/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.10/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-5.10/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch index 39b98eac1b..282c8196e5 100644 --- a/target/linux/generic/pending-5.10/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch +++ b/target/linux/generic/pending-5.10/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/compiler.h +++ b/include/linux/compiler.h -@@ -211,6 +211,8 @@ void ftrace_likely_update(struct ftrace_ +@@ -213,6 +213,8 @@ void ftrace_likely_update(struct ftrace_ __v; \ }) @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif /* __KERNEL__ */ /* -@@ -243,6 +245,4 @@ static inline void *offset_to_ptr(const +@@ -245,6 +247,4 @@ static inline void *offset_to_ptr(const */ #define prevent_tail_call_optimization() mb() diff --git a/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch index 42a8397839..cf52fa36ca 100644 --- a/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -484,7 +484,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -486,7 +486,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); |