kernel: bump 5.4 to 5.4.28

Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648,
CVE-2020-8649 and CVE-2020-8647.

Removed upstreamed:

 generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch
 generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch
 bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch
 ipq806x: 701-stmmac-fix-notifier-registration.patch
 lantiq: 002-pinctrl-falcon-fix-syntax-error.patch
 octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch

Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617
Build tested: sunxi/a53, imx6, x86/64, ipq40xx

Tested-by: Kevin Darbyshire-Bryant <[email protected]> [apu2]
Signed-off-by: Petr Štetiar <[email protected]>

include/kernel-version.mk

@@ -8,11 +8,11 @@ endif
 
 LINUX_VERSION-4.14 = .172
 LINUX_VERSION-4.19 = .108
-LINUX_VERSION-5.4 = .24
+LINUX_VERSION-5.4 = .28
 
 LINUX_KERNEL_HASH-4.14.172 = 2318a1ab937580a079351ed20557c336a3d95b664f667b14e3ba49e3271b217a
 LINUX_KERNEL_HASH-4.19.108 = 09aeeca5b08efea2f54b977b2999afb60d42f93b9f65b2b0111969f183f750a3
-LINUX_KERNEL_HASH-5.4.24 = 7fa0ac784c78129beed43260a7a22a077f1041ac0e8e88647284d2cf7b1d7eb3
+LINUX_KERNEL_HASH-5.4.28 = c863cc1346348f9a40083b4bc0d34375117b1c401af920994d42e855653ef7a4
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <[email protected]>
  static const char hcd_name[] = "xhci_hcd";
  
  static struct hc_driver __read_mostly xhci_pci_hc_driver;
-@@ -283,6 +323,873 @@ static void xhci_pme_acpi_rtd3_enable(st
+@@ -284,6 +324,873 @@ static void xhci_pme_acpi_rtd3_enable(st
  static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
  #endif /* CONFIG_ACPI */
  
@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <[email protected]>
  /* called during probe() after chip reset completes */
  static int xhci_pci_setup(struct usb_hcd *hcd)
  {
-@@ -324,6 +1231,27 @@ static int xhci_pci_probe(struct pci_dev
+@@ -325,6 +1232,27 @@ static int xhci_pci_probe(struct pci_dev
  	struct hc_driver *driver;
  	struct usb_hcd *hcd;
  
@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <[email protected]>
  	driver = (struct hc_driver *)id->driver_data;
  
  	/* Prevent runtime suspending between USB-2 and USB-3 initialization */
-@@ -385,6 +1313,16 @@ static void xhci_pci_remove(struct pci_d
+@@ -386,6 +1314,16 @@ static void xhci_pci_remove(struct pci_d
  {
  	struct xhci_hcd *xhci;
  
@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <[email protected]>
  	xhci = hcd_to_xhci(pci_get_drvdata(dev));
  	xhci->xhc_state |= XHCI_STATE_REMOVING;
  
-@@ -512,6 +1450,11 @@ static int xhci_pci_resume(struct usb_hc
+@@ -513,6 +1451,11 @@ static int xhci_pci_resume(struct usb_hc
  	if (pdev->vendor == PCI_VENDOR_ID_INTEL)
  		usb_enable_intel_xhci_ports(pdev);
  

target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch

@@ -13,7 +13,7 @@ produce a noisy warning.
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -274,6 +274,7 @@ static void xhci_pci_quirks(struct devic
+@@ -275,6 +275,7 @@ static void xhci_pci_quirks(struct devic
  	    pdev->device == 0x0015) {
  		xhci->quirks |= XHCI_RESET_ON_RESUME;
  		xhci->quirks |= XHCI_ZERO_64B_REGS;

target/linux/ath79/patches-5.4/0060-serial-ar933x_uart-set-UART_CS_-RX-TX-_READY_ORIDE.patch

@@ -40,9 +40,9 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/tty/serial/ar933x_uart.c
 +++ b/drivers/tty/serial/ar933x_uart.c
-@@ -286,6 +286,10 @@ static void ar933x_uart_set_termios(stru
+@@ -290,6 +290,10 @@ static void ar933x_uart_set_termios(stru
  	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
- 			    AR933X_UART_CS_HOST_INT_EN);
+ 		AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
  
 +	/* enable RX and TX ready overide */
 +	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
@@ -51,14 +51,14 @@ Signed-off-by: Daniel Golle <[email protected]>
  	/* reenable the UART */
  	ar933x_uart_rmw(up, AR933X_UART_CS_REG,
  			AR933X_UART_CS_IF_MODE_M << AR933X_UART_CS_IF_MODE_S,
-@@ -418,6 +422,10 @@ static int ar933x_uart_startup(struct ua
- 	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
- 			    AR933X_UART_CS_HOST_INT_EN);
+@@ -424,6 +428,10 @@ static int ar933x_uart_startup(struct ua
  
-+	/* enable RX and TX ready overide */
-+	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
+ 	/* enable RX and TX ready overide */
+ 	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
 +		AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
 +
++	/* enable RX and TX ready overide */
++	ar933x_uart_rmw_set(up, AR933X_UART_CS_REG,
+ 		AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
+ 
  	/* Enable RX interrupts */
- 	up->ier = AR933X_UART_INT_RX_VALID;
- 	ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);

target/linux/ath79/patches-5.4/0061-tty-serial-ar933x-uart-rs485-gpio.patch

@@ -160,7 +160,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  }
  
  static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
-@@ -336,11 +393,20 @@ static void ar933x_uart_rx_chars(struct
+@@ -340,11 +397,20 @@ static void ar933x_uart_rx_chars(struct
  static void ar933x_uart_tx_chars(struct ar933x_uart_port *up)
  {
  	struct circ_buf *xmit = &up->port.state->xmit;
@@ -181,7 +181,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  	count = up->port.fifosize;
  	do {
  		unsigned int rdata;
-@@ -368,8 +434,14 @@ static void ar933x_uart_tx_chars(struct
+@@ -372,8 +438,14 @@ static void ar933x_uart_tx_chars(struct
  	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
  		uart_write_wakeup(&up->port);
  
@@ -197,7 +197,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  }
  
  static irqreturn_t ar933x_uart_interrupt(int irq, void *dev_id)
-@@ -427,8 +499,7 @@ static int ar933x_uart_startup(struct ua
+@@ -435,8 +507,7 @@ static int ar933x_uart_startup(struct ua
  		AR933X_UART_CS_TX_READY_ORIDE | AR933X_UART_CS_RX_READY_ORIDE);
  
  	/* Enable RX interrupts */
@@ -207,7 +207,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  
  	spin_unlock_irqrestore(&up->port.lock, flags);
  
-@@ -511,6 +582,21 @@ static const struct uart_ops ar933x_uart
+@@ -519,6 +590,21 @@ static const struct uart_ops ar933x_uart
  	.verify_port	= ar933x_uart_verify_port,
  };
  
@@ -229,7 +229,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  #ifdef CONFIG_SERIAL_AR933X_CONSOLE
  static struct ar933x_uart_port *
  ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
-@@ -680,6 +766,8 @@ static int ar933x_uart_probe(struct plat
+@@ -688,6 +774,8 @@ static int ar933x_uart_probe(struct plat
  		goto err_disable_clk;
  	}
  
@@ -238,7 +238,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  	port->mapbase = mem_res->start;
  	port->line = id;
  	port->irq = irq_res->start;
-@@ -690,6 +778,7 @@ static int ar933x_uart_probe(struct plat
+@@ -698,6 +786,7 @@ static int ar933x_uart_probe(struct plat
  	port->regshift = 2;
  	port->fifosize = AR933X_UART_FIFO_SIZE;
  	port->ops = &ar933x_uart_ops;
@@ -246,7 +246,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
  
  	baud = ar933x_uart_get_baud(port->uartclk, AR933X_UART_MAX_SCALE, 1);
  	up->min_baud = max_t(unsigned int, baud, AR933X_UART_MIN_BAUD);
-@@ -697,6 +786,18 @@ static int ar933x_uart_probe(struct plat
+@@ -705,6 +794,18 @@ static int ar933x_uart_probe(struct plat
  	baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
  	up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);
  

target/linux/bcm27xx/patches-5.4/950-0011-spi-spidev-Completely-disable-the-spidev-warning.patch

@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -724,7 +724,7 @@ static int spidev_probe(struct spi_devic
+@@ -729,7 +729,7 @@ static int spidev_probe(struct spi_devic
  	 * compatible string, it is a Linux implementation thing
  	 * rather than a description of the hardware.
  	 */

target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch

@@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5302,7 +5302,7 @@ static void port_event(struct usb_hub *h
+@@ -5306,7 +5306,7 @@ static void port_event(struct usb_hub *h
  		port_dev->over_current_count++;
  		port_over_current_notify(port_dev);
  

target/linux/bcm27xx/patches-5.4/950-0056-Improve-__copy_to_user-and-__copy_from_user-performa.patch

@@ -276,7 +276,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  ENDPROC(arm_copy_from_user)
 +ENDPROC(__copy_from_user_std)
  
- 	.pushsection .fixup,"ax"
+ 	.pushsection .text.fixup,"ax"
  	.align 0
 --- /dev/null
 +++ b/arch/arm/lib/exports_rpi.c

target/linux/bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch

@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5707,6 +5707,8 @@ int __init cgroup_init_early(void)
+@@ -5720,6 +5720,8 @@ int __init cgroup_init_early(void)
  }
  
  static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  
  /**
   * cgroup_init - cgroup initialization
-@@ -5746,6 +5748,12 @@ int __init cgroup_init(void)
+@@ -5759,6 +5761,12 @@ int __init cgroup_init(void)
  
  	mutex_unlock(&cgroup_mutex);
  
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6165,6 +6173,28 @@ static int __init cgroup_disable(char *s
+@@ -6178,6 +6186,28 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
  

target/linux/bcm27xx/patches-5.4/950-0215-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch

@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -243,6 +243,10 @@ static void xhci_pci_quirks(struct devic
+@@ -244,6 +244,10 @@ static void xhci_pci_quirks(struct devic
  			pdev->device == 0x3432)
  		xhci->quirks |= XHCI_BROKEN_STREAMS;
  

target/linux/bcm27xx/patches-5.4/950-0268-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch

@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -244,8 +244,10 @@ static void xhci_pci_quirks(struct devic
+@@ -245,8 +245,10 @@ static void xhci_pci_quirks(struct devic
  		xhci->quirks |= XHCI_BROKEN_STREAMS;
  
  	if (pdev->vendor == PCI_VENDOR_ID_VIA &&

target/linux/bcm27xx/patches-5.4/950-0284-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch

@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  
-@@ -1224,6 +1227,9 @@
+@@ -1226,6 +1229,9 @@
  #define USB_VENDOR_ID_XAT	0x2505
  #define USB_DEVICE_ID_XAT_CSR	0x0220
  
@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -175,6 +176,7 @@ static const struct hid_device_id hid_qu
+@@ -176,6 +177,7 @@ static const struct hid_device_id hid_qu
  	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },

target/linux/bcm27xx/patches-5.4/950-0317-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch

@@ -31,6 +31,6 @@ Signed-off-by: Phil Elwell <[email protected]>
 +%.dtbo: prepare3 scripts_dtc
 +	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
 +
- PHONY += dtbs dtbs_install dt_binding_check
+ PHONY += dtbs dtbs_install dtbs_check
  dtbs dtbs_check: include/config/kernel.release scripts_dtc
  	$(Q)$(MAKE) $(build)=$(dtstree)

target/linux/bcm27xx/patches-5.4/950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch

@@ -1,44 +0,0 @@
-From 9a536b0cb8f83bd979fe274ef0197ece12a3ed09 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <[email protected]>
-Date: Thu, 20 Feb 2020 21:29:56 +0100
-Subject: [PATCH] ASoC: pcm512x: Fix unbalanced regulator enable call
- in probe error path
-
-commit ac0a68997935c4acb92eaae5ad8982e0bb432d56 upstream.
-
-When we get a clock error during probe we have to call
-regulator_bulk_disable before bailing out, otherwise we trigger
-a warning in regulator_put.
-
-Fix this by using "goto err" like in the error cases above.
-
-Fixes: 5a3af1293194d ("ASoC: pcm512x: Add PCM512x driver")
-Signed-off-by: Matthias Reichl <[email protected]>
-Reviewed-by: Pierre-Louis Bossart <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Mark Brown <[email protected]>
----
- sound/soc/codecs/pcm512x.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/sound/soc/codecs/pcm512x.c
-+++ b/sound/soc/codecs/pcm512x.c
-@@ -1564,13 +1564,15 @@ int pcm512x_probe(struct device *dev, st
- 	}
- 
- 	pcm512x->sclk = devm_clk_get(dev, NULL);
--	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)
--		return -EPROBE_DEFER;
-+	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) {
-+		ret = -EPROBE_DEFER;
-+		goto err;
-+	}
- 	if (!IS_ERR(pcm512x->sclk)) {
- 		ret = clk_prepare_enable(pcm512x->sclk);
- 		if (ret != 0) {
- 			dev_err(dev, "Failed to enable SCLK: %d\n", ret);
--			return ret;
-+			goto err;
- 		}
- 	}
- 

target/linux/bcm27xx/patches-5.4/950-0466-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch

@@ -23,4 +23,4 @@ Signed-off-by: Nataliya Korovkina <[email protected]>
 +%.dtbo: include/config/kernel.release scripts_dtc
  	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
  
- PHONY += dtbs dtbs_install dt_binding_check
+ PHONY += dtbs dtbs_install dtbs_check

target/linux/bcm27xx/patches-5.4/950-0480-drm-modes-parse_cmdline-Fix-possible-reference-past-.patch

@@ -138,4 +138,4 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-1-hdego
 +		sep = delim;
  	}
  
- 	mode->rotation_reflection = rotation;
+ 	if (!(rotation & DRM_MODE_ROTATE_MASK))

target/linux/bcm27xx/patches-5.4/950-0481-drm-modes-parse_cmdline-Make-various-char-pointers-c.patch

@@ -37,7 +37,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdego
  
  		option = sep + 1;
  		delim = strchr(option, '=');
-@@ -1718,8 +1718,8 @@ bool drm_mode_parse_command_line_for_con
+@@ -1725,8 +1725,8 @@ bool drm_mode_parse_command_line_for_con
  	bool named_mode = false, parse_extras = false;
  	unsigned int bpp_off = 0, refresh_off = 0, options_off = 0;
  	unsigned int mode_end = 0;

target/linux/bcm27xx/patches-5.4/950-0482-drm-modes-parse_cmdline-Stop-parsing-extras-after-bp.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1721,7 +1721,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1728,7 +1728,7 @@ bool drm_mode_parse_command_line_for_con
  	const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
  	const char *options_ptr = NULL;
  	char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
  
  #ifdef CONFIG_FB
  	if (!mode_option)
-@@ -1841,9 +1841,11 @@ bool drm_mode_parse_command_line_for_con
+@@ -1848,9 +1848,11 @@ bool drm_mode_parse_command_line_for_con
  	else if (refresh_ptr)
  		extra_ptr = refresh_end_ptr;
  
@@ -53,14 +53,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
  						   connector, mode);
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-@@ -60,3 +60,4 @@ cmdline_test(drm_cmdline_test_vmirror)
+@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_vmirror)
  cmdline_test(drm_cmdline_test_margin_options)
  cmdline_test(drm_cmdline_test_multiple_options)
  cmdline_test(drm_cmdline_test_invalid_option)
 +cmdline_test(drm_cmdline_test_bpp_extra_and_option)
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-@@ -992,6 +992,32 @@ static int drm_cmdline_test_invalid_opti
+@@ -1003,6 +1003,32 @@ static int drm_cmdline_test_invalid_opti
  	return 0;
  }
  

target/linux/bcm27xx/patches-5.4/950-0483-drm-modes-parse_cmdline-Accept-extras-directly-after.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1794,6 +1794,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1801,6 +1801,7 @@ bool drm_mode_parse_command_line_for_con
  		mode_end = refresh_off;
  	} else if (options_ptr) {
  		mode_end = options_off;
@@ -37,14 +37,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego
  		parse_extras = true;
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-@@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_margin_opt
+@@ -62,3 +62,4 @@ cmdline_test(drm_cmdline_test_margin_opt
  cmdline_test(drm_cmdline_test_multiple_options)
  cmdline_test(drm_cmdline_test_invalid_option)
  cmdline_test(drm_cmdline_test_bpp_extra_and_option)
 +cmdline_test(drm_cmdline_test_extra_and_option)
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-@@ -1018,6 +1018,30 @@ static int drm_cmdline_test_bpp_extra_an
+@@ -1029,6 +1029,30 @@ static int drm_cmdline_test_bpp_extra_an
  	return 0;
  }
  

target/linux/bcm27xx/patches-5.4/950-0484-drm-modes-parse_cmdline-Rework-drm_mode_parse_cmdlin.patch

@@ -61,9 +61,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-5-hdego
 +		option = sep + 1;
 +	} while (sep);
  
- 	mode->rotation_reflection = rotation;
- 
-@@ -1855,9 +1854,7 @@ bool drm_mode_parse_command_line_for_con
+ 	if (!(rotation & DRM_MODE_ROTATE_MASK))
+ 		rotation |= DRM_MODE_ROTATE_0;
+@@ -1862,9 +1861,7 @@ bool drm_mode_parse_command_line_for_con
  	}
  
  	if (options_ptr) {

target/linux/bcm27xx/patches-5.4/950-0485-drm-modes-parse_cmdline-Add-freestanding-argument-to.patch

@@ -29,9 +29,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego
  					  const struct drm_connector *connector,
  					  struct drm_cmdline_mode *mode)
  {
-@@ -1663,6 +1664,9 @@ static int drm_mode_parse_cmdline_option
- 		option = sep + 1;
- 	} while (sep);
+@@ -1670,6 +1671,9 @@ static int drm_mode_parse_cmdline_option
+ 	if (!is_power_of_2(rotation & DRM_MODE_ROTATE_MASK))
+ 		return -EINVAL;
  
 +	if (rotation && freestanding)
 +		return -EINVAL;
@@ -39,7 +39,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego
  	mode->rotation_reflection = rotation;
  
  	return 0;
-@@ -1855,6 +1859,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1862,6 +1866,7 @@ bool drm_mode_parse_command_line_for_con
  
  	if (options_ptr) {
  		ret = drm_mode_parse_cmdline_options(options_ptr + 1,

target/linux/bcm27xx/patches-5.4/950-0486-drm-modes-parse_cmdline-Set-bpp-refresh_specified-af.patch

@@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1771,10 +1771,8 @@ bool drm_mode_parse_command_line_for_con
+@@ -1778,10 +1778,8 @@ bool drm_mode_parse_command_line_for_con
  
  	/* Try to locate the bpp and refresh specifiers, if any */
  	bpp_ptr = strchr(name, '-');
@@ -36,7 +36,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego
  
  	refresh_ptr = strchr(name, '@');
  	if (refresh_ptr) {
-@@ -1782,7 +1780,6 @@ bool drm_mode_parse_command_line_for_con
+@@ -1789,7 +1787,6 @@ bool drm_mode_parse_command_line_for_con
  			return false;
  
  		refresh_off = refresh_ptr - name;
@@ -44,7 +44,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego
  	}
  
  	/* Locate the start of named options */
-@@ -1825,6 +1822,8 @@ bool drm_mode_parse_command_line_for_con
+@@ -1832,6 +1829,8 @@ bool drm_mode_parse_command_line_for_con
  		ret = drm_mode_parse_cmdline_bpp(bpp_ptr, &bpp_end_ptr, mode);
  		if (ret)
  			return false;
@@ -53,7 +53,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego
  	}
  
  	if (refresh_ptr) {
-@@ -1832,6 +1831,8 @@ bool drm_mode_parse_command_line_for_con
+@@ -1839,6 +1838,8 @@ bool drm_mode_parse_command_line_for_con
  						     &refresh_end_ptr, mode);
  		if (ret)
  			return false;

target/linux/bcm27xx/patches-5.4/950-0487-drm-modes-parse_cmdline-Allow-specifying-stand-alone.patch

@@ -27,7 +27,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1677,17 +1677,6 @@ static const char * const drm_named_mode
+@@ -1684,17 +1684,6 @@ static const char * const drm_named_mode
  	"PAL",
  };
  
@@ -45,7 +45,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  /**
   * drm_mode_parse_command_line_for_connector - parse command line modeline for connector
   * @mode_option: optional per connector mode option
-@@ -1718,7 +1707,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1725,7 +1714,7 @@ bool drm_mode_parse_command_line_for_con
  					       struct drm_cmdline_mode *mode)
  {
  	const char *name;
@@ -54,7 +54,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  	unsigned int bpp_off = 0, refresh_off = 0, options_off = 0;
  	unsigned int mode_end = 0;
  	const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
-@@ -1738,49 +1727,14 @@ bool drm_mode_parse_command_line_for_con
+@@ -1745,49 +1734,14 @@ bool drm_mode_parse_command_line_for_con
  
  	name = mode_option;
  
@@ -105,7 +105,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  
  	/* Locate the start of named options */
  	options_ptr = strchr(name, ',');
-@@ -1800,23 +1754,45 @@ bool drm_mode_parse_command_line_for_con
+@@ -1807,23 +1761,45 @@ bool drm_mode_parse_command_line_for_con
  		parse_extras = true;
  	}
  
@@ -160,7 +160,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  
  	if (bpp_ptr) {
  		ret = drm_mode_parse_cmdline_bpp(bpp_ptr, &bpp_end_ptr, mode);
-@@ -1852,7 +1828,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1859,7 +1835,7 @@ bool drm_mode_parse_command_line_for_con
  		else
  			len = strlen(extra_ptr);
  
@@ -169,7 +169,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  						   connector, mode);
  		if (ret)
  			return false;
-@@ -1860,7 +1836,7 @@ bool drm_mode_parse_command_line_for_con
+@@ -1867,7 +1843,7 @@ bool drm_mode_parse_command_line_for_con
  
  	if (options_ptr) {
  		ret = drm_mode_parse_cmdline_options(options_ptr + 1,
@@ -180,7 +180,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  			return false;
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-@@ -62,3 +62,5 @@ cmdline_test(drm_cmdline_test_multiple_o
+@@ -63,3 +63,5 @@ cmdline_test(drm_cmdline_test_multiple_o
  cmdline_test(drm_cmdline_test_invalid_option)
  cmdline_test(drm_cmdline_test_bpp_extra_and_option)
  cmdline_test(drm_cmdline_test_extra_and_option)
@@ -188,7 +188,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
 +cmdline_test(drm_cmdline_test_freestanding_force_e_and_options)
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-@@ -1042,6 +1042,56 @@ static int drm_cmdline_test_extra_and_op
+@@ -1053,6 +1053,56 @@ static int drm_cmdline_test_extra_and_op
  	return 0;
  }
  

target/linux/bcm27xx/patches-5.4/950-0488-drm-modes-parse_cmdline-Add-support-for-specifying-p.patch

@@ -91,7 +91,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego
  		} else {
  			return -EINVAL;
  		}
-@@ -1715,6 +1745,8 @@ bool drm_mode_parse_command_line_for_con
+@@ -1722,6 +1752,8 @@ bool drm_mode_parse_command_line_for_con
  	char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
  	int i, len, ret;
  
@@ -102,14 +102,14 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego
  		mode_option = fb_mode_option;
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-@@ -64,3 +64,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_
+@@ -65,3 +65,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_
  cmdline_test(drm_cmdline_test_extra_and_option)
  cmdline_test(drm_cmdline_test_freestanding_options)
  cmdline_test(drm_cmdline_test_freestanding_force_e_and_options)
 +cmdline_test(drm_cmdline_test_panel_orientation)
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-@@ -1092,6 +1092,28 @@ static int drm_cmdline_test_freestanding
+@@ -1103,6 +1103,28 @@ static int drm_cmdline_test_freestanding
  	return 0;
  }
  

target/linux/bcm27xx/patches-5.4/950-0489-drm-modes-parse_cmdline-Remove-some-unnecessary-code.patch

@@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-10-hdeg
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1747,11 +1747,6 @@ bool drm_mode_parse_command_line_for_con
+@@ -1754,11 +1754,6 @@ bool drm_mode_parse_command_line_for_con
  
  	mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
  

target/linux/bcm27xx/patches-5.4/950-0490-drm-modes-parse_cmdline-Explicitly-memset-the-passed.patch

@@ -24,7 +24,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-11-hdeg
 
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1745,12 +1745,11 @@ bool drm_mode_parse_command_line_for_con
+@@ -1752,12 +1752,11 @@ bool drm_mode_parse_command_line_for_con
  	char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
  	int i, len, ret;
  

target/linux/generic/backport-5.4/507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch

@@ -1,30 +0,0 @@
-From 61338e27e2eef3bfcd3df5c39cec5b9dc10ba25c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <[email protected]>
-Date: Sun, 23 Feb 2020 22:08:25 +0100
-Subject: [PATCH] iio: chemical: sps30: fix missing triggered buffer dependency
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-SPS30 uses triggered buffer, but the dependency is not specified in the
-Kconfig file.  Fix this by selecting IIO_BUFFER and IIO_TRIGGERED_BUFFER
-config symbols.
-
-Cc: [email protected]
-Fixes: 232e0f6ddeae ("iio: chemical: add support for Sensirion SPS30 sensor")
-Signed-off-by: Petr Štetiar <[email protected]>
----
- drivers/iio/chemical/Kconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/iio/chemical/Kconfig
-+++ b/drivers/iio/chemical/Kconfig
-@@ -91,6 +91,8 @@ config SPS30
- 	tristate "SPS30 particulate matter sensor"
- 	depends on I2C
- 	select CRC8
-+	select IIO_BUFFER
-+	select IIO_TRIGGERED_BUFFER
- 	help
- 	  Say Y here to build support for the Sensirion SPS30 particulate
- 	  matter sensor.

target/linux/generic/backport-5.4/600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch

@@ -1,71 +0,0 @@
-From 82afdcd4ec3c8ca6551cbf7c43c09e2fd240487a Mon Sep 17 00:00:00 2001
-From: Hangbin Liu <[email protected]>
-Date: Tue, 10 Mar 2020 15:27:37 +0800
-Subject: [PATCH] ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rafał found an issue that for non-Ethernet interface, if we down and up
-frequently, the memory will be consumed slowly.
-
-The reason is we add allnodes/allrouters addressed in multicast list in
-ipv6_add_dev(). When link down, we call ipv6_mc_down(), store all multicast
-addresses via mld_add_delrec(). But when link up, we don't call ipv6_mc_up()
-for non-Ethernet interface to remove the addresses. This makes idev->mc_tomb
-getting bigger and bigger. The call stack looks like:
-
-addrconf_notify(NETDEV_REGISTER)
-	ipv6_add_dev
-		ipv6_dev_mc_inc(ff01::1)
-		ipv6_dev_mc_inc(ff02::1)
-		ipv6_dev_mc_inc(ff02::2)
-
-addrconf_notify(NETDEV_UP)
-	addrconf_dev_config
-		/* Alas, we support only Ethernet autoconfiguration. */
-		return;
-
-addrconf_notify(NETDEV_DOWN)
-	addrconf_ifdown
-		ipv6_mc_down
-			igmp6_group_dropped(ff02::2)
-				mld_add_delrec(ff02::2)
-			igmp6_group_dropped(ff02::1)
-			igmp6_group_dropped(ff01::1)
-
-After investigating, I can't found a rule to disable multicast on
-non-Ethernet interface. In RFC2460, the link could be Ethernet, PPP, ATM,
-tunnels, etc. In IPv4, it doesn't check the dev type when calls ip_mc_up()
-in inetdev_event(). Even for IPv6, we don't check the dev type and call
-ipv6_add_dev(), ipv6_dev_mc_inc() after register device.
-
-So I think it's OK to fix this memory consumer by calling ipv6_mc_up() for
-non-Ethernet interface.
-
-v2: Also check IFF_MULTICAST flag to make sure the interface supports
-    multicast
-
-Reported-by: Rafał Miłecki <[email protected]>
-Tested-by: Rafał Miłecki <[email protected]>
-Fixes: 74235a25c673 ("[IPV6] addrconf: Fix IPv6 on tuntap tunnels")
-Fixes: 1666d49e1d41 ("mld: do not remove mld souce list info when set link down")
-Signed-off-by: Hangbin Liu <[email protected]>
-Signed-off-by: David S. Miller <[email protected]>
----
- net/ipv6/addrconf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/net/ipv6/addrconf.c
-+++ b/net/ipv6/addrconf.c
-@@ -3345,6 +3345,10 @@ static void addrconf_dev_config(struct n
- 	    (dev->type != ARPHRD_NONE) &&
- 	    (dev->type != ARPHRD_RAWIP)) {
- 		/* Alas, we support only Ethernet autoconfiguration. */
-+		idev = __in6_dev_get(dev);
-+		if (!IS_ERR_OR_NULL(idev) && dev->flags & IFF_UP &&
-+		    dev->flags & IFF_MULTICAST)
-+			ipv6_mc_up(idev);
- 		return;
- 	}
- 

target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch

@@ -24,7 +24,7 @@ Signed-off-by: Russell King <[email protected]>
  #include <linux/workqueue.h>
  #include <linux/mdio.h>
  #include <linux/io.h>
-@@ -841,6 +842,9 @@ void phy_stop(struct phy_device *phydev)
+@@ -842,6 +843,9 @@ void phy_stop(struct phy_device *phydev)
  
  	mutex_lock(&phydev->lock);
  
@@ -34,7 +34,7 @@ Signed-off-by: Russell King <[email protected]>
  	phydev->state = PHY_HALTED;
  
  	mutex_unlock(&phydev->lock);
-@@ -903,6 +907,9 @@ void phy_state_machine(struct work_struc
+@@ -904,6 +908,9 @@ void phy_state_machine(struct work_struc
  
  	old_state = phydev->state;
  
@@ -54,7 +54,7 @@ Signed-off-by: Russell King <[email protected]>
  #include <linux/mdio.h>
  #include <linux/io.h>
  #include <linux/uaccess.h>
-@@ -1178,6 +1179,65 @@ phy_standalone_show(struct device *dev,
+@@ -1183,6 +1184,65 @@ phy_standalone_show(struct device *dev,
  static DEVICE_ATTR_RO(phy_standalone);
  
  /**
@@ -120,7 +120,7 @@ Signed-off-by: Russell King <[email protected]>
   * phy_attach_direct - attach a network device to a given PHY device pointer
   * @dev: network device to attach
   * @phydev: Pointer to phy_device to attach
-@@ -1254,6 +1314,9 @@ int phy_attach_direct(struct net_device
+@@ -1259,6 +1319,9 @@ int phy_attach_direct(struct net_device
  		dev->phydev = phydev;
  	}
  
@@ -130,7 +130,7 @@ Signed-off-by: Russell King <[email protected]>
  	/* Some Ethernet drivers try to connect to a PHY device before
  	 * calling register_netdevice() -> netdev_register_kobject() and
  	 * does the dev->dev.kobj initialization. Here we only check for
-@@ -2282,6 +2345,9 @@ static int phy_remove(struct device *dev
+@@ -2287,6 +2350,9 @@ static int phy_remove(struct device *dev
  	phydev->state = PHY_DOWN;
  	mutex_unlock(&phydev->lock);
  
@@ -151,7 +151,7 @@ Signed-off-by: Russell King <[email protected]>
  struct sk_buff;
  
  /*
-@@ -342,6 +344,8 @@ struct phy_c45_device_ids {
+@@ -343,6 +345,8 @@ struct phy_c45_device_ids {
   * dev_flags: Device-specific flags used by the PHY driver.
   * irq: IRQ number of the PHY's interrupt (-1 if none)
   * phy_timer: The timer for handling the state machine
@@ -160,7 +160,7 @@ Signed-off-by: Russell King <[email protected]>
   * attached_dev: The attached enet driver's device instance ptr
   * adjust_link: Callback for the enet controller to respond to
   * changes in the link state.
-@@ -432,6 +436,9 @@ struct phy_device {
+@@ -434,6 +438,9 @@ struct phy_device {
  
  	struct mutex lock;
  
@@ -170,7 +170,7 @@ Signed-off-by: Russell King <[email protected]>
  	struct phylink *phylink;
  	struct net_device *attached_dev;
  
-@@ -1020,6 +1027,10 @@ int phy_suspend(struct phy_device *phyde
+@@ -1023,6 +1030,10 @@ int phy_suspend(struct phy_device *phyde
  int phy_resume(struct phy_device *phydev);
  int __phy_resume(struct phy_device *phydev);
  int phy_loopback(struct phy_device *phydev, bool enable);

target/linux/generic/hack-5.4/220-gc_sections.patch

@@ -31,7 +31,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  	select OF_EARLY_FLATTREE if OF
 --- a/arch/arm/boot/compressed/Makefile
 +++ b/arch/arm/boot/compressed/Makefile
-@@ -107,6 +107,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
+@@ -106,6 +106,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y)
  ORIG_CFLAGS := $(KBUILD_CFLAGS)
  KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
  endif

target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch

@@ -1,6 +1,6 @@
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -522,6 +522,12 @@ struct phy_driver {
+@@ -524,6 +524,12 @@ struct phy_driver {
  	/* Determines the negotiated speed and duplex */
  	int (*read_status)(struct phy_device *phydev);
  
@@ -15,7 +15,7 @@
  
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1822,6 +1822,9 @@ int genphy_update_link(struct phy_device
+@@ -1827,6 +1827,9 @@ int genphy_update_link(struct phy_device
  	if (bmcr & BMCR_ANRESTART)
  		goto done;
  

target/linux/generic/hack-5.4/902-debloat_proc.patch

@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2961,6 +2961,8 @@ static const struct seq_operations locks
+@@ -2989,6 +2989,8 @@ static const struct seq_operations locks
  
  static int __init proc_locks_init(void)
  {
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!pe)
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -3549,6 +3549,8 @@ static const struct seq_operations vmall
+@@ -3552,6 +3552,8 @@ static const struct seq_operations vmall
  
  static int __init proc_vmalloc_init(void)
  {
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -3603,6 +3603,8 @@ static __net_initdata struct pernet_oper
+@@ -3606,6 +3606,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {

target/linux/generic/hack-5.4/904-debloat_dma_buf.patch

@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	selftest.o \
 --- a/drivers/dma-buf/dma-buf.c
 +++ b/drivers/dma-buf/dma-buf.c
-@@ -1297,4 +1297,5 @@ static void __exit dma_buf_deinit(void)
+@@ -1298,4 +1298,5 @@ static void __exit dma_buf_deinit(void)
  	dma_buf_uninit_debugfs();
  	kern_unmount(dma_buf_mnt);
  }

target/linux/generic/pending-5.4/130-add-linux-spidev-compatible-si3210.patch

@@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis <[email protected]>
 
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -668,6 +668,7 @@ static const struct of_device_id spidev_
+@@ -673,6 +673,7 @@ static const struct of_device_id spidev_
  	{ .compatible = "lwn,bk4" },
  	{ .compatible = "dh,dhcom-board" },
  	{ .compatible = "menlo,m53cpld" },

target/linux/generic/pending-5.4/630-packet_socket_type.patch

@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3267,6 +3269,7 @@ static int packet_create(struct net *net
+@@ -3268,6 +3270,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -3900,6 +3903,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3901,6 +3904,16 @@ packet_setsockopt(struct socket *sock, i
  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -3956,6 +3969,13 @@ static int packet_getsockopt(struct sock
+@@ -3957,6 +3970,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR:
  		val = po->has_vnet_hdr;
  		break;

target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch

@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 +MODULE_ALIAS("nf-flow-table-hw");
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -5740,6 +5740,13 @@ static int nf_tables_flowtable_parse_hoo
+@@ -5745,6 +5745,13 @@ static int nf_tables_flowtable_parse_hoo
  	if (err < 0)
  		return err;
  
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
  	if (!ops)
  		return -ENOMEM;
-@@ -5870,10 +5877,19 @@ static int nf_tables_newflowtable(struct
+@@ -5875,10 +5882,19 @@ static int nf_tables_newflowtable(struct
  	}
  
  	flowtable->data.type = type;
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
  					     flowtable);
  	if (err < 0)
-@@ -5999,7 +6015,8 @@ static int nf_tables_fill_flowtable_info
+@@ -6004,7 +6020,8 @@ static int nf_tables_fill_flowtable_info
  	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
  	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
  	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),

target/linux/generic/pending-5.4/703-phy-add-detach-callback-to-struct-phy_driver.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1458,6 +1458,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1463,6 +1463,9 @@ void phy_detach(struct phy_device *phyde
  	struct module *ndev_owner = NULL;
  	struct mii_bus *bus;
  
@@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
  			sysfs_remove_link(&dev->dev.kobj, "phydev");
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -537,6 +537,12 @@ struct phy_driver {
+@@ -540,6 +540,12 @@ struct phy_driver {
  	/* Override default interrupt handling */
  	int (*handle_interrupt)(struct phy_device *phydev);
  

target/linux/imx6/patches-5.4/001-ARM-dts-imx-Add-GW5907-board-support.patch

@@ -26,11 +26,9 @@ Signed-off-by: Shawn Guo <[email protected]>
  create mode 100644 arch/arm/boot/dts/imx6q-gw5907.dts
  create mode 100644 arch/arm/boot/dts/imx6qdl-gw5907.dtsi
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 1e9e1af..9ee80e2 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -422,6 +422,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -418,6 +418,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6dl-gw560x.dtb \
  	imx6dl-gw5903.dtb \
  	imx6dl-gw5904.dtb \
@@ -38,7 +36,7 @@ index 1e9e1af..9ee80e2 100644
  	imx6dl-hummingboard.dtb \
  	imx6dl-hummingboard-emmc-som-v15.dtb \
  	imx6dl-hummingboard-som-v15.dtb \
-@@ -493,6 +494,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -489,6 +490,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6q-gw560x.dtb \
  	imx6q-gw5903.dtb \
  	imx6q-gw5904.dtb \
@@ -46,9 +44,6 @@ index 1e9e1af..9ee80e2 100644
  	imx6q-h100.dtb \
  	imx6q-hummingboard.dtb \
  	imx6q-hummingboard-emmc-som-v15.dtb \
-diff --git a/arch/arm/boot/dts/imx6dl-gw5907.dts b/arch/arm/boot/dts/imx6dl-gw5907.dts
-new file mode 100644
-index 00000000..3fa2822
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6dl-gw5907.dts
 @@ -0,0 +1,14 @@
@@ -66,9 +61,6 @@ index 00000000..3fa2822
 +	model = "Gateworks Ventana i.MX6 DualLite/Solo GW5907";
 +	compatible = "gw,imx6dl-gw5907", "gw,ventana", "fsl,imx6dl";
 +};
-diff --git a/arch/arm/boot/dts/imx6q-gw5907.dts b/arch/arm/boot/dts/imx6q-gw5907.dts
-new file mode 100644
-index 00000000..b25526e
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6q-gw5907.dts
 @@ -0,0 +1,14 @@
@@ -86,9 +78,6 @@ index 00000000..b25526e
 +	model = "Gateworks Ventana i.MX6 Dual/Quad GW5907";
 +	compatible = "gw,imx6q-gw5907", "gw,ventana", "fsl,imx6q";
 +};
-diff --git a/arch/arm/boot/dts/imx6qdl-gw5907.dtsi b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
-new file mode 100644
-index 00000000..0bdebdd
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw5907.dtsi
 @@ -0,0 +1,399 @@
@@ -491,6 +480,3 @@ index 00000000..0bdebdd
 +		>;
 +	};
 +};
--- 
-2.7.4
-

target/linux/imx6/patches-5.4/002-ARM-dts-imx-Add-GW5910-board-support.patch

@@ -35,11 +35,9 @@ Signed-off-by: Shawn Guo <[email protected]>
  create mode 100644 arch/arm/boot/dts/imx6q-gw5910.dts
  create mode 100644 arch/arm/boot/dts/imx6qdl-gw5910.dtsi
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 9ee80e2..85e53cc 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -423,6 +423,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -419,6 +419,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6dl-gw5903.dtb \
  	imx6dl-gw5904.dtb \
  	imx6dl-gw5907.dtb \
@@ -47,7 +45,7 @@ index 9ee80e2..85e53cc 100644
  	imx6dl-hummingboard.dtb \
  	imx6dl-hummingboard-emmc-som-v15.dtb \
  	imx6dl-hummingboard-som-v15.dtb \
-@@ -495,6 +496,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -491,6 +492,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6q-gw5903.dtb \
  	imx6q-gw5904.dtb \
  	imx6q-gw5907.dtb \
@@ -55,9 +53,6 @@ index 9ee80e2..85e53cc 100644
  	imx6q-h100.dtb \
  	imx6q-hummingboard.dtb \
  	imx6q-hummingboard-emmc-som-v15.dtb \
-diff --git a/arch/arm/boot/dts/imx6dl-gw5910.dts b/arch/arm/boot/dts/imx6dl-gw5910.dts
-new file mode 100644
-index 00000000..0d5e7e5
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6dl-gw5910.dts
 @@ -0,0 +1,14 @@
@@ -75,9 +70,6 @@ index 00000000..0d5e7e5
 +	model = "Gateworks Ventana i.MX6 DualLite/Solo GW5910";
 +	compatible = "gw,imx6dl-gw5910", "gw,ventana", "fsl,imx6dl";
 +};
-diff --git a/arch/arm/boot/dts/imx6q-gw5910.dts b/arch/arm/boot/dts/imx6q-gw5910.dts
-new file mode 100644
-index 00000000..6aafa2f
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6q-gw5910.dts
 @@ -0,0 +1,14 @@
@@ -95,9 +87,6 @@ index 00000000..6aafa2f
 +	model = "Gateworks Ventana i.MX6 Dual/Quad GW5910";
 +	compatible = "gw,imx6q-gw5910", "gw,ventana", "fsl,imx6q";
 +};
-diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
-new file mode 100644
-index 00000000..be1af74
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
 @@ -0,0 +1,491 @@
@@ -592,6 +581,3 @@ index 00000000..be1af74
 +		>;
 +	};
 +};
--- 
-2.7.4
-

target/linux/imx6/patches-5.4/003-ARM-dts-imx-Add-GW5913-board-support.patch

@@ -30,11 +30,9 @@ Signed-off-by: Shawn Guo <[email protected]>
  create mode 100644 arch/arm/boot/dts/imx6q-gw5913.dts
  create mode 100644 arch/arm/boot/dts/imx6qdl-gw5913.dtsi
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 85e53cc..5b059fc 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -424,6 +424,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6dl-gw5904.dtb \
  	imx6dl-gw5907.dtb \
  	imx6dl-gw5910.dtb \
@@ -42,7 +40,7 @@ index 85e53cc..5b059fc 100644
  	imx6dl-hummingboard.dtb \
  	imx6dl-hummingboard-emmc-som-v15.dtb \
  	imx6dl-hummingboard-som-v15.dtb \
-@@ -497,6 +498,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -493,6 +494,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6q-gw5904.dtb \
  	imx6q-gw5907.dtb \
  	imx6q-gw5910.dtb \
@@ -50,9 +48,6 @@ index 85e53cc..5b059fc 100644
  	imx6q-h100.dtb \
  	imx6q-hummingboard.dtb \
  	imx6q-hummingboard-emmc-som-v15.dtb \
-diff --git a/arch/arm/boot/dts/imx6dl-gw5913.dts b/arch/arm/boot/dts/imx6dl-gw5913.dts
-new file mode 100644
-index 00000000..b74e533
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6dl-gw5913.dts
 @@ -0,0 +1,14 @@
@@ -70,9 +65,6 @@ index 00000000..b74e533
 +	model = "Gateworks Ventana i.MX6 DualLite/Solo GW5913";
 +	compatible = "gw,imx6dl-gw5913", "gw,ventana", "fsl,imx6dl";
 +};
-diff --git a/arch/arm/boot/dts/imx6q-gw5913.dts b/arch/arm/boot/dts/imx6q-gw5913.dts
-new file mode 100644
-index 00000000..6f511f1
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6q-gw5913.dts
 @@ -0,0 +1,14 @@
@@ -90,9 +82,6 @@ index 00000000..6f511f1
 +	model = "Gateworks Ventana i.MX6 Dual/Quad GW5913";
 +	compatible = "gw,imx6q-gw5913", "gw,ventana", "fsl,imx6q";
 +};
-diff --git a/arch/arm/boot/dts/imx6qdl-gw5913.dtsi b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
-new file mode 100644
-index 00000000..635c203
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw5913.dtsi
 @@ -0,0 +1,348 @@
@@ -444,6 +433,3 @@ index 00000000..635c203
 +		>;
 +	};
 +};
--- 
-2.7.4
-

target/linux/imx6/patches-5.4/004-ARM-dts-imx-Add-GW5912-board-support.patch

@@ -35,11 +35,9 @@ Signed-off-by: Shawn Guo <[email protected]>
  create mode 100644 arch/arm/boot/dts/imx6q-gw5912.dts
  create mode 100644 arch/arm/boot/dts/imx6qdl-gw5912.dtsi
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 5b059fc..1a32a7d 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -424,6 +424,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6dl-gw5904.dtb \
  	imx6dl-gw5907.dtb \
  	imx6dl-gw5910.dtb \
@@ -47,7 +45,7 @@ index 5b059fc..1a32a7d 100644
  	imx6dl-gw5913.dtb \
  	imx6dl-hummingboard.dtb \
  	imx6dl-hummingboard-emmc-som-v15.dtb \
-@@ -498,6 +499,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -494,6 +495,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
  	imx6q-gw5904.dtb \
  	imx6q-gw5907.dtb \
  	imx6q-gw5910.dtb \
@@ -55,9 +53,6 @@ index 5b059fc..1a32a7d 100644
  	imx6q-gw5913.dtb \
  	imx6q-h100.dtb \
  	imx6q-hummingboard.dtb \
-diff --git a/arch/arm/boot/dts/imx6dl-gw5912.dts b/arch/arm/boot/dts/imx6dl-gw5912.dts
-new file mode 100644
-index 00000000..5260e01
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6dl-gw5912.dts
 @@ -0,0 +1,13 @@
@@ -74,9 +69,6 @@ index 00000000..5260e01
 +	model = "Gateworks Ventana i.MX6 DualLite/Solo GW5912";
 +	compatible = "gw,imx6dl-gw5912", "gw,ventana", "fsl,imx6dl";
 +};
-diff --git a/arch/arm/boot/dts/imx6q-gw5912.dts b/arch/arm/boot/dts/imx6q-gw5912.dts
-new file mode 100644
-index 00000000..4dcbd94
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6q-gw5912.dts
 @@ -0,0 +1,13 @@
@@ -93,9 +85,6 @@ index 00000000..4dcbd94
 +	model = "Gateworks Ventana i.MX6 Dual/Quad GW5912";
 +	compatible = "gw,imx6q-gw5912", "gw,ventana", "fsl,imx6q";
 +};
-diff --git a/arch/arm/boot/dts/imx6qdl-gw5912.dtsi b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
-new file mode 100644
-index 00000000..8c57fd2
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx6qdl-gw5912.dtsi
 @@ -0,0 +1,461 @@
@@ -560,6 +549,3 @@ index 00000000..8c57fd2
 +		>;
 +	};
 +};
--- 
-2.7.4
-

target/linux/ipq806x/patches-5.4/701-stmmac-fix-notifier-registration.patch

@@ -1,79 +0,0 @@
-From 474a31e13a4e9749fb3ee55794d69d0f17ee0998 Mon Sep 17 00:00:00 2001
-From: Aaro Koskinen <[email protected]>
-Date: Wed, 26 Feb 2020 18:49:01 +0200
-Subject: net: stmmac: fix notifier registration
-
-We cannot register the same netdev notifier multiple times when probing
-stmmac devices. Register the notifier only once in module init, and also
-make debugfs creation/deletion safe against simultaneous notifier call.
-
-Fixes: 481a7d154cbb ("stmmac: debugfs entry name is not be changed when udev rename device name.")
-Signed-off-by: Aaro Koskinen <[email protected]>
-Signed-off-by: David S. Miller <[email protected]>
----
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-(limited to 'drivers/net/ethernet/stmicro/stmmac')
-
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -4208,6 +4208,8 @@ static void stmmac_init_fs(struct net_de
- {
- 	struct stmmac_priv *priv = netdev_priv(dev);
- 
-+	rtnl_lock();
-+
- 	/* Create per netdev entries */
- 	priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
- 
-@@ -4219,14 +4221,13 @@ static void stmmac_init_fs(struct net_de
- 	debugfs_create_file("dma_cap", 0444, priv->dbgfs_dir, dev,
- 			    &stmmac_dma_cap_fops);
- 
--	register_netdevice_notifier(&stmmac_notifier);
-+	rtnl_unlock();
- }
- 
- static void stmmac_exit_fs(struct net_device *dev)
- {
- 	struct stmmac_priv *priv = netdev_priv(dev);
- 
--	unregister_netdevice_notifier(&stmmac_notifier);
- 	debugfs_remove_recursive(priv->dbgfs_dir);
- }
- #endif /* CONFIG_DEBUG_FS */
-@@ -4728,14 +4729,14 @@ int stmmac_dvr_remove(struct device *dev
- 
- 	netdev_info(priv->dev, "%s: removing driver", __func__);
- 
--#ifdef CONFIG_DEBUG_FS
--	stmmac_exit_fs(ndev);
--#endif
- 	stmmac_stop_all_dma(priv);
- 
- 	stmmac_mac_set(priv, priv->ioaddr, false);
- 	netif_carrier_off(ndev);
- 	unregister_netdev(ndev);
-+#ifdef CONFIG_DEBUG_FS
-+	stmmac_exit_fs(ndev);
-+#endif
- 	phylink_destroy(priv->phylink);
- 	if (priv->plat->stmmac_rst)
- 		reset_control_assert(priv->plat->stmmac_rst);
-@@ -4955,6 +4956,7 @@ static int __init stmmac_init(void)
- 	/* Create debugfs main directory if it doesn't exist yet */
- 	if (!stmmac_fs_dir)
- 		stmmac_fs_dir = debugfs_create_dir(STMMAC_RESOURCE_NAME, NULL);
-+	register_netdevice_notifier(&stmmac_notifier);
- #endif
- 
- 	return 0;
-@@ -4963,6 +4965,7 @@ static int __init stmmac_init(void)
- static void __exit stmmac_exit(void)
- {
- #ifdef CONFIG_DEBUG_FS
-+	unregister_netdevice_notifier(&stmmac_notifier);
- 	debugfs_remove_recursive(stmmac_fs_dir);
- #endif
- }

target/linux/lantiq/patches-5.4/002-pinctrl-falcon-fix-syntax-error.patch

@@ -1,25 +0,0 @@
-From d2fee0bb982195540e4fbe009996fcdbc26d163c Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <[email protected]>
-Date: Thu, 5 Mar 2020 08:17:27 +0100
-Subject: [PATCH] pinctrl: falcon: fix syntax error
-
-Add the missing semicolon after of_node_put to get the file compiled.
-
-Fixes: f17d2f54d36d ("pinctrl: falcon: Add of_node_put() before return")
-Cc: [email protected] # v5.4+
-Signed-off-by: Mathias Kresin <[email protected]>
----
- drivers/pinctrl/pinctrl-falcon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/pinctrl-falcon.c
-+++ b/drivers/pinctrl/pinctrl-falcon.c
-@@ -451,7 +451,7 @@ static int pinctrl_falcon_probe(struct p
- 		falcon_info.clk[*bank] = clk_get(&ppdev->dev, NULL);
- 		if (IS_ERR(falcon_info.clk[*bank])) {
- 			dev_err(&ppdev->dev, "failed to get clock\n");
--			of_node_put(np)
-+			of_node_put(np);
- 			return PTR_ERR(falcon_info.clk[*bank]);
- 		}
- 		falcon_info.membase[*bank] = devm_ioremap_resource(&pdev->dev,

target/linux/mxs/patches-5.4/100-ARM-dts-imx23-introduce-mmc0_sck_cfg.patch

@@ -24,8 +24,6 @@ Signed-off-by: Shawn Guo <[email protected]>
  arch/arm/boot/dts/imx23.dtsi          | 8 ++++++++
  2 files changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
-index 4c9aafe00b5d..0729e72f2283 100644
 --- a/arch/arm/boot/dts/imx23-olinuxino.dts
 +++ b/arch/arm/boot/dts/imx23-olinuxino.dts
 @@ -23,7 +23,7 @@
@@ -37,8 +35,6 @@ index 4c9aafe00b5d..0729e72f2283 100644
  				bus-width = <4>;
  				broken-cd;
  				status = "okay";
-diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
-index eb0aeda1682c..c5edff381213 100644
 --- a/arch/arm/boot/dts/imx23.dtsi
 +++ b/arch/arm/boot/dts/imx23.dtsi
 @@ -267,6 +267,14 @@
@@ -56,6 +52,3 @@ index eb0aeda1682c..c5edff381213 100644
  				mmc1_4bit_pins_a: mmc1-4bit@0 {
  					reg = <0>;
  					fsl,pinmux-ids = <
--- 
-2.17.1
-

target/linux/octeontx/patches-5.4/0001-net-thunderx-use-proper-interface-type-for-RGMII.patch

@@ -29,11 +29,9 @@ Signed-off-by: David S. Miller <[email protected]>
  drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-index 8ae28f8..5f2db9c 100644
 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
 +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-@@ -1042,7 +1042,7 @@ static int phy_interface_mode(u8 lmac_type)
+@@ -1048,7 +1048,7 @@ static int phy_interface_mode(u8 lmac_ty
  	if (lmac_type == BGX_MODE_QSGMII)
  		return PHY_INTERFACE_MODE_QSGMII;
  	if (lmac_type == BGX_MODE_RGMII)
@@ -42,6 +40,3 @@ index 8ae28f8..5f2db9c 100644
  
  	return PHY_INTERFACE_MODE_SGMII;
  }
--- 
-2.7.4
-

target/linux/octeontx/patches-5.4/0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch

@@ -1,150 +0,0 @@
-From 585ddca487c827178cf697f8bc2e87346061d155 Mon Sep 17 00:00:00 2001
-From: Tim Harvey <[email protected]>
-Date: Wed, 19 Feb 2020 15:19:36 -0800
-Subject: [PATCH 02/12] net: thunderx: workaround BGX TX Underflow issue
-
-While it is not yet understood why a TX underflow can easily occur
-for SGMII interfaces resulting in a TX wedge. It has been found that
-disabling/re-enabling the LMAC resolves the issue.
-
-Signed-off-by: Tim Harvey <[email protected]>
-Reviewed-by: Robert Jones <[email protected]>
-Signed-off-by: David S. Miller <[email protected]>
----
- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 62 +++++++++++++++++++++--
- drivers/net/ethernet/cavium/thunder/thunder_bgx.h |  9 ++++
- 2 files changed, 68 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-index 5f2db9c..ade414a 100644
---- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-@@ -413,10 +413,19 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable)
- 	lmac = &bgx->lmac[lmacid];
- 
- 	cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
--	if (enable)
-+	if (enable) {
- 		cfg |= CMR_PKT_RX_EN | CMR_PKT_TX_EN;
--	else
-+
-+		/* enable TX FIFO Underflow interrupt */
-+		bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1S,
-+			       GMI_TXX_INT_UNDFLW);
-+	} else {
- 		cfg &= ~(CMR_PKT_RX_EN | CMR_PKT_TX_EN);
-+
-+		/* Disable TX FIFO Underflow interrupt */
-+		bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1C,
-+			       GMI_TXX_INT_UNDFLW);
-+	}
- 	bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);
- 
- 	if (bgx->is_rgx)
-@@ -1544,6 +1553,48 @@ static int bgx_init_phy(struct bgx *bgx)
- 	return bgx_init_of_phy(bgx);
- }
- 
-+static irqreturn_t bgx_intr_handler(int irq, void *data)
-+{
-+	struct bgx *bgx = (struct bgx *)data;
-+	u64 status, val;
-+	int lmac;
-+
-+	for (lmac = 0; lmac < bgx->lmac_count; lmac++) {
-+		status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT);
-+		if (status & GMI_TXX_INT_UNDFLW) {
-+			pci_err(bgx->pdev, "BGX%d lmac%d UNDFLW\n",
-+				bgx->bgx_id, lmac);
-+			val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG);
-+			val &= ~CMR_EN;
-+			bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
-+			val |= CMR_EN;
-+			bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
-+		}
-+		/* clear interrupts */
-+		bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void bgx_register_intr(struct pci_dev *pdev)
-+{
-+	struct bgx *bgx = pci_get_drvdata(pdev);
-+	int ret;
-+
-+	ret = pci_alloc_irq_vectors(pdev, BGX_LMAC_VEC_OFFSET,
-+				    BGX_LMAC_VEC_OFFSET, PCI_IRQ_ALL_TYPES);
-+	if (ret < 0) {
-+		pci_err(pdev, "Req for #%d msix vectors failed\n",
-+			BGX_LMAC_VEC_OFFSET);
-+		return;
-+	}
-+	ret = pci_request_irq(pdev, GMPX_GMI_TX_INT, bgx_intr_handler, NULL,
-+			      bgx, "BGX%d", bgx->bgx_id);
-+	if (ret)
-+		pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
-+}
-+
- static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- {
- 	int err;
-@@ -1559,7 +1610,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 
- 	pci_set_drvdata(pdev, bgx);
- 
--	err = pci_enable_device(pdev);
-+	err = pcim_enable_device(pdev);
- 	if (err) {
- 		dev_err(dev, "Failed to enable PCI device\n");
- 		pci_set_drvdata(pdev, NULL);
-@@ -1613,6 +1664,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 
- 	bgx_init_hw(bgx);
- 
-+	bgx_register_intr(pdev);
-+
- 	/* Enable all LMACs */
- 	for (lmac = 0; lmac < bgx->lmac_count; lmac++) {
- 		err = bgx_lmac_enable(bgx, lmac);
-@@ -1629,6 +1682,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 
- err_enable:
- 	bgx_vnic[bgx->bgx_id] = NULL;
-+	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
- err_release_regions:
- 	pci_release_regions(pdev);
- err_disable_device:
-@@ -1646,6 +1700,8 @@ static void bgx_remove(struct pci_dev *pdev)
- 	for (lmac = 0; lmac < bgx->lmac_count; lmac++)
- 		bgx_lmac_disable(bgx, lmac);
- 
-+	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
-+
- 	bgx_vnic[bgx->bgx_id] = NULL;
- 	pci_release_regions(pdev);
- 	pci_disable_device(pdev);
-diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-index cbdd20b..ac0c89c 100644
---- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-@@ -183,6 +183,15 @@
- #define BGX_GMP_GMI_TXX_BURST		0x38228
- #define BGX_GMP_GMI_TXX_MIN_PKT		0x38240
- #define BGX_GMP_GMI_TXX_SGMII_CTL	0x38300
-+#define BGX_GMP_GMI_TXX_INT		0x38500
-+#define BGX_GMP_GMI_TXX_INT_W1S		0x38508
-+#define BGX_GMP_GMI_TXX_INT_ENA_W1C	0x38510
-+#define BGX_GMP_GMI_TXX_INT_ENA_W1S	0x38518
-+#define  GMI_TXX_INT_PTP_LOST			BIT_ULL(4)
-+#define  GMI_TXX_INT_LATE_COL			BIT_ULL(3)
-+#define  GMI_TXX_INT_XSDEF			BIT_ULL(2)
-+#define  GMI_TXX_INT_XSCOL			BIT_ULL(1)
-+#define  GMI_TXX_INT_UNDFLW			BIT_ULL(0)
- 
- #define BGX_MSIX_VEC_0_29_ADDR		0x400000 /* +(0..29) << 4 */
- #define BGX_MSIX_VEC_0_29_CTL		0x400008
--- 
-2.7.4
-

target/linux/octeontx/patches-5.4/0003-can-mcp251x-convert-to-half-duplex-SPI.patch

@@ -12,11 +12,9 @@ Signed-off-by: Tim Harvey <[email protected]>
  drivers/net/can/spi/mcp251x.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
-index 0b0dd3f0..c655b29 100644
 --- a/drivers/net/can/spi/mcp251x.c
 +++ b/drivers/net/can/spi/mcp251x.c
-@@ -345,8 +345,7 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)
+@@ -291,23 +291,23 @@ static u8 mcp251x_read_reg(struct spi_de
  	priv->spi_tx_buf[0] = INSTRUCTION_READ;
  	priv->spi_tx_buf[1] = reg;
  
@@ -26,9 +24,8 @@ index 0b0dd3f0..c655b29 100644
  
  	return val;
  }
-@@ -354,15 +353,16 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)
- static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg,
- 		uint8_t *v1, uint8_t *v2)
+ 
+ static void mcp251x_read_2regs(struct spi_device *spi, u8 reg, u8 *v1, u8 *v2)
  {
 +	u8 val[4] = {0};
  	struct mcp251x_priv *priv = spi_get_drvdata(spi);
@@ -45,7 +42,4 @@ index 0b0dd3f0..c655b29 100644
 +	*v2 = val[1];
  }
  
- static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)
--- 
-2.7.4
-
+ static void mcp251x_write_reg(struct spi_device *spi, u8 reg, u8 val)

target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch

@@ -12,11 +12,9 @@ Signed-off-by: Tim Harvey <[email protected]>
  drivers/pci/quirks.c | 32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
 
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 419dda6..40e2ddb 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
  #include <linux/ktime.h>
  #include <linux/mm.h>
  #include <linux/nvme.h>
@@ -24,7 +22,7 @@ index 419dda6..40e2ddb 100644
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
  #include <linux/switchtec.h>
-@@ -5216,3 +5217,34 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev)
+@@ -5431,3 +5432,34 @@ out_disable:
  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1,
  			      PCI_CLASS_DISPLAY_VGA, 8,
  			      quirk_reset_lenovo_thinkpad_p50_nvgpu);
@@ -59,6 +57,3 @@ index 419dda6..40e2ddb 100644
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8606, newport_pciesw_early_fixup);
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8604, newport_pciesw_early_fixup);
 +#endif /* CONFIG_PCI_HOST_THUNDER_PEM */
--- 
-2.7.4
-

target/linux/oxnas/patches-5.4/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch

@@ -32,11 +32,9 @@ Cc: Daniel Golle <[email protected]>
  drivers/irqchip/irq-versatile-fpga.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
-index 70e2cfff8175..f1386733d3bc 100644
 --- a/drivers/irqchip/irq-versatile-fpga.c
 +++ b/drivers/irqchip/irq-versatile-fpga.c
-@@ -212,6 +212,9 @@ int __init fpga_irq_of_init(struct device_node *node,
+@@ -212,6 +212,9 @@ int __init fpga_irq_of_init(struct devic
  	if (of_property_read_u32(node, "valid-mask", &valid_mask))
  		valid_mask = 0;
  
@@ -46,7 +44,7 @@ index 70e2cfff8175..f1386733d3bc 100644
  	/* Some chips are cascaded from a parent IRQ */
  	parent_irq = irq_of_parse_and_map(node, 0);
  	if (!parent_irq) {
-@@ -221,9 +224,6 @@ int __init fpga_irq_of_init(struct device_node *node,
+@@ -221,9 +224,6 @@ int __init fpga_irq_of_init(struct devic
  
  	fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
  

target/linux/sunxi/patches-5.4/410-v5.6-arm64-dts-allwinner-a64-olinuxino-Add-bank-supply-re.patch

@@ -20,8 +20,6 @@ Signed-off-by: Maxime Ripard <[email protected]>
  .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 17 +++++++++++++++++
  2 files changed, 21 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts
-index 96ab0227e82d..a1629688e694 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts
 @@ -21,3 +21,7 @@
@@ -32,8 +30,6 @@ index 96ab0227e82d..a1629688e694 100644
 +&pio {
 +	vcc-pc-supply = <&reg_eldo1>;
 +};
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-index 01a9a52edae4..3e026a95a58a 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
 @@ -163,6 +163,23 @@

target/linux/sunxi/patches-5.4/420-v5.7-arm64-dts-allwinner-a64-olinuxino-add-user-red-LED.patch

@@ -12,11 +12,9 @@ description.
 
 Signed-off-by: Petr Štetiar <[email protected]>
 
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-index 6dfafa1c879b..b9f90e19c035 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-@@ -32,6 +32,15 @@
+@@ -70,6 +70,15 @@
  		};
  	};
  

target/linux/sunxi/patches-5.4/430-arm64-dts-allwinner-a64-olinuxino-add-status-LED-ali.patch

@@ -8,11 +8,9 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Petr Štetiar <[email protected]>
 
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-index b9f90e19c035..5b42bb251fbf 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
-@@ -15,6 +15,10 @@
+@@ -53,6 +53,10 @@
  	aliases {
  		ethernet0 = &emac;
  		serial0 = &uart0;
@@ -23,7 +21,7 @@ index b9f90e19c035..5b42bb251fbf 100644
  	};
  
  	chosen {
-@@ -35,7 +39,7 @@
+@@ -73,7 +77,7 @@
  	leds {
  		compatible = "gpio-leds";