projects / openwrt / staging / ynezz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e238c85)
kernel: bump 5.4 to 5.4.43
authorPetr Štetiar <ynezz@true.cz>
Tue, 2 Jun 2020 08:51:02 +0000 (10:51 +0200)
committerPetr Štetiar <ynezz@true.cz>
Tue, 2 Jun 2020 15:46:51 +0000 (17:46 +0200)
Refreshed patches, removed upstreamed patch:

 bcm27xx: 950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch

Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53

Signed-off-by: Petr Štetiar <ynezz@true.cz>
include/kernel-version.mk patch | blob | history
target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0316-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch [deleted file] patch | blob | history
target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch patch | blob | history
target/linux/generic/pending-5.4/205-backtrace_module_info.patch patch | blob | history
target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch patch | blob | history
target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch patch | blob | history

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9394897b1f0af4a78ffd4ac79d288caa54fa91d6..3a446ffb18e858a17a3b3e776d45044a0174fb16 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -8,11 +8,11 @@ endif
 
 LINUX_VERSION-4.14 = .180
 LINUX_VERSION-4.19 = .123
-LINUX_VERSION-5.4 = .42
+LINUX_VERSION-5.4 = .43
 
 LINUX_KERNEL_HASH-4.14.180 = 444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e
 LINUX_KERNEL_HASH-4.19.123 = a79914d31a8d8c6b0e2bb0f2b143d615fe8a6c4dd2e0f36e97aa20efd69a993f
-LINUX_KERNEL_HASH-5.4.42 = 4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31
+LINUX_KERNEL_HASH-5.4.43 = 2667b90a42d42557aca9e3d37bba1b4e71809b9523958e6870ada311c4790744
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
index cf943d8c442d8b1421d70eeee4d3cdf6fecd1fee..0f41faf9df94ec058cf5d787635076fa4dd98da5 100644 (file)
--- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
@@ -464,7 +464,7 @@
  #define IGMP_HOST_MEMBERSHIP_REPORT   0x12    /* Ditto */
 --- a/net/core/flow_dissector.c
 +++ b/net/core/flow_dissector.c
-@@ -196,7 +196,7 @@ __be32 __skb_flow_get_ports(const struct
+@@ -212,7 +212,7 @@ __be32 __skb_flow_get_ports(const struct
                ports = __skb_header_pointer(skb, thoff + poff,
                                             sizeof(_ports), data, hlen, &_ports);
                if (ports)
diff --git a/target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index 203e8638a24bc75b3f0d77400c075e06a74b6324..7f2b53562e7125cc1f0d83e9a8b0253b18239764 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
-@@ -1226,6 +1229,9 @@
+@@ -1231,6 +1234,9 @@
  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  
@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
        { 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 },
-@@ -176,6 +177,7 @@ static const struct hid_device_id hid_qu
+@@ -177,6 +178,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 },
diff --git a/target/linux/bcm27xx/patches-5.4/950-0316-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch b/target/linux/bcm27xx/patches-5.4/950-0316-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch
index 826311e9ec7c022474cc275fa422c646992b1e36..24b11387e6f8e9c0f38af02b06a633c4fae616ef 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0316-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0316-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch
@@ -32,5 +32,5 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 +      $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
 +
  PHONY += dtbs dtbs_install dtbs_check
- dtbs dtbs_check: include/config/kernel.release scripts_dtc
+ dtbs: include/config/kernel.release scripts_dtc
        $(Q)$(MAKE) $(build)=$(dtstree)
diff --git a/target/linux/bcm27xx/patches-5.4/950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch b/target/linux/bcm27xx/patches-5.4/950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch
deleted file mode 100644 (file)
index f7b1217..0000000
--- a/target/linux/bcm27xx/patches-5.4/950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8695764265eb6e749c9fdc901e98c2e7b4d2adfc Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Fri, 10 Apr 2020 20:23:13 -0600
-Subject: [PATCH] component: Silence bind error on -EPROBE_DEFER
-
-If a component fails to bind due to -EPROBE_DEFER we should not log an
-error as this is not a real failure.
-
-Fixes:
-vc4-drm soc:gpu: failed to bind 3f902000.hdmi (ops vc4_hdmi_ops): -517
-vc4-drm soc:gpu: master bind failed: -517
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
----
- drivers/base/component.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/drivers/base/component.c
-+++ b/drivers/base/component.c
-@@ -257,7 +257,8 @@ static int try_to_bring_up_master(struct
-       ret = master->ops->bind(master->dev);
-       if (ret < 0) {
-               devres_release_group(master->dev, NULL);
--              dev_info(master->dev, "master bind failed: %d\n", ret);
-+              if (ret != -EPROBE_DEFER)
-+                      dev_info(master->dev, "master bind failed: %d\n", ret);
-               return ret;
-       }
- 
-@@ -611,8 +612,9 @@ static int component_bind(struct compone
-               devres_release_group(component->dev, NULL);
-               devres_release_group(master->dev, NULL);
- 
--              dev_err(master->dev, "failed to bind %s (ops %ps): %d\n",
--                      dev_name(component->dev), component->ops, ret);
-+              if (ret != -EPROBE_DEFER)
-+                      dev_err(master->dev, "failed to bind %s (ops %ps): %d\n",
-+                              dev_name(component->dev), component->ops, ret);
-       }
- 
-       return ret;
diff --git a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
index 1a3065d89f3ce1576f050c759b729821841bf1eb..c977b377b7bbb1178cfc9142fb532e0ff6228639 100644 (file)
--- a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
+++ b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                }
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -152,6 +152,10 @@ kallsyms()
+@@ -164,6 +164,10 @@ kallsyms()
                kallsymopt="${kallsymopt} --base-relative"
        fi
  
diff --git a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch
index 857db9a9307cf36e661e3d7e4860b418558d8d31..39a4365113f712d43628d6cce835bb80a1d80cde 100644 (file)
--- a/target/linux/generic/pending-5.4/205-backtrace_module_info.patch
+++ b/target/linux/generic/pending-5.4/205-backtrace_module_info.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
-@@ -907,8 +907,10 @@ char *symbol_string(char *buf, char *end
+@@ -914,8 +914,10 @@ char *symbol_string(char *buf, char *end
                    struct printf_spec spec, const char *fmt)
  {
        unsigned long value;
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif
  
        if (fmt[1] == 'R')
-@@ -925,8 +927,14 @@ char *symbol_string(char *buf, char *end
+@@ -932,8 +934,14 @@ char *symbol_string(char *buf, char *end
  
        return string_nocheck(buf, end, sym, spec);
  #else
diff --git a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
index 1056d801be067ef1228b1e67588ad5e4ac3c8a00..ff4be6006cd0adc0fd0512ad0288b99476d876b5 100644 (file)
--- a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -4644,6 +4644,14 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4652,6 +4652,14 @@ static int mvneta_ethtool_set_eee(struct
        return phylink_ethtool_set_eee(pp->phylink, eee);
  }
  
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static const struct net_device_ops mvneta_netdev_ops = {
        .ndo_open            = mvneta_open,
        .ndo_stop            = mvneta_stop,
-@@ -4654,6 +4662,7 @@ static const struct net_device_ops mvnet
+@@ -4662,6 +4670,7 @@ static const struct net_device_ops mvnet
        .ndo_fix_features    = mvneta_fix_features,
        .ndo_get_stats64     = mvneta_get_stats64,
        .ndo_do_ioctl        = mvneta_ioctl,
diff --git a/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
index b1c508abab4c47fdd275d3a0d6cbdaa0873530b1..53916a59e6b00e9161f54d60ac8777dd0614b322 100644 (file)
--- a/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
+++ b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
@@ -12,8 +12,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  .../boot/dts/marvell/armada-3720-uDPU.dts     | 22 +++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-index 7eb6c1796cef..95d46e8d081c 100644
 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 @@ -117,18 +117,36 @@
@@ -55,6 +53,3 @@ index 7eb6c1796cef..95d46e8d081c 100644
  
        lm75@48 {
                status = "okay";
--- 
-2.20.1
-
Staging tree of Petr Stetiar