diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-05-04 14:53:34 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-04 21:05:21 +0200 |
| commit | f9ef0c570550c9cbda3f28522753472d0d048378 (patch) | |
| tree | f5ddd3755b9e36df6cd32e6858f0cf9eb9f549ff /target/linux/brcm2708 | |
| parent | 2df0ea042d14dbfc2735b843eb82a0ae0d8bec19 (diff) | |
| download | upstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.gz upstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.bz2 upstream-f9ef0c570550c9cbda3f28522753472d0d048378.zip | |
kernel: bump 4.14 to 4.14.178
Refreshed all patches and removed upstreamed:
oxnas/001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch
oxnas/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch
Fixes: CVE-2020-12114 and CVE-2020-11669
Runtime-tested on: qemu-x86-64
Compile-tested on: ath79/generic, x86/64, imx6
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/brcm2708')
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch index 5cb3fffcc0..c0d9578a2f 100644 --- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch @@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com> } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5116,7 +5116,7 @@ static void port_event(struct usb_hub *h +@@ -5130,7 +5130,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -852,7 +852,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com> msleep(100); /* Cool down */ --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1925,6 +1925,85 @@ free_interfaces: +@@ -1932,6 +1932,85 @@ free_interfaces: if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); diff --git a/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 53ce26537a..416914da6e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.14/950-0280-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2323,7 +2325,7 @@ static int _gpiod_direction_output_raw(s +@@ -2306,7 +2308,7 @@ static int _gpiod_direction_output_raw(s int ret; /* GPIOs used for IRQs shall not be set as output */ @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -2849,7 +2851,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -2832,7 +2834,7 @@ int gpiochip_lock_as_irq(struct gpio_chi set_bit(FLAG_IS_OUT, &desc->flags); } diff --git a/target/linux/brcm2708/patches-4.14/950-0291-ARM-dts-bcm283x-Fix-DTC-warnings-about-missing-phy-c.patch b/target/linux/brcm2708/patches-4.14/950-0291-ARM-dts-bcm283x-Fix-DTC-warnings-about-missing-phy-c.patch index 402abec755..c2ed7afa5e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0291-ARM-dts-bcm283x-Fix-DTC-warnings-about-missing-phy-c.patch +++ b/target/linux/brcm2708/patches-4.14/950-0291-ARM-dts-bcm283x-Fix-DTC-warnings-about-missing-phy-c.patch @@ -17,7 +17,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net> --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -639,5 +639,6 @@ +@@ -640,5 +640,6 @@ usbphy: phy { compatible = "usb-nop-xceiv"; diff --git a/target/linux/brcm2708/patches-4.14/950-0341-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch b/target/linux/brcm2708/patches-4.14/950-0341-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch index eb3635a8f1..65818b95bd 100644 --- a/target/linux/brcm2708/patches-4.14/950-0341-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch +++ b/target/linux/brcm2708/patches-4.14/950-0341-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch @@ -142,7 +142,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +}; --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -544,6 +544,34 @@ +@@ -545,6 +545,34 @@ status = "disabled"; }; |