projects / openwrt / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 558596b)
kernel: bump 5.4 to 5.4.110
authorJohn Audia <graysky@archlinux.us>
Wed, 7 Apr 2021 14:13:50 +0000 (10:13 -0400)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Sat, 10 Apr 2021 18:27:40 +0000 (20:27 +0200)
Ran update_kernel.sh in a fresh clone without any existing toolchains.

Manually rebased due to movement of rx-offload.c in 5.4.110:
  layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
  layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
  layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
  layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
  layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
  layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch

Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
include/kernel-version.mk patch | blob | history
target/linux/generic/hack-5.4/204-module_strip.patch patch | blob | history
target/linux/generic/hack-5.4/721-phy_packets.patch patch | blob | history
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch patch | blob | history
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch patch | blob | history
target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch patch | blob | history

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 2e29f637bbdac11755e8dd2508c3847b5379d8db..74fd81969b21643d13b71d74bdcea9639ed63d86 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .109
+LINUX_VERSION-5.4 = .110
 LINUX_VERSION-5.10 = .27
 
-LINUX_KERNEL_HASH-5.4.109 = ac6af4562717d030266fcddb0a3c44598610ca8c9c3a654725f58b9cbd61b7ee
+LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
 LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch
index ca0c228e10b27bd2719c338b2bff3912842b5ebc..96e124b21a84b3611bb9a284634119737ec9bb00 100644 (file)
--- a/target/linux/generic/hack-5.4/204-module_strip.patch
+++ b/target/linux/generic/hack-5.4/204-module_strip.patch
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config MODULES_TREE_LOOKUP
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3142,9 +3142,11 @@ static int setup_load_info(struct load_i
+@@ -3224,9 +3224,11 @@ static int setup_load_info(struct load_i
  
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (flags & MODULE_INIT_IGNORE_VERMAGIC)
                modmagic = NULL;
  
-@@ -3165,6 +3167,7 @@ static int check_modinfo(struct module *
+@@ -3247,6 +3249,7 @@ static int check_modinfo(struct module *
                                mod->name);
                add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
        }
diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch
index 55233369ef831a5db0ef10250396b1682f21a8cb..836fc54ba2977ebb3c5289fcc6b6976611fe5649 100644 (file)
--- a/target/linux/generic/hack-5.4/721-phy_packets.patch
+++ b/target/linux/generic/hack-5.4/721-phy_packets.patch
@@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #define IFF_LIVE_RENAME_OK            IFF_LIVE_RENAME_OK
 +#define IFF_NO_IP_ALIGN                       IFF_NO_IP_ALIGN
  
- /**
-  *    struct net_device - The DEVICE structure.
-@@ -1882,6 +1884,11 @@ struct net_device {
+ /* Specifies the type of the struct net_device::ml_priv pointer */
+ enum netdev_ml_priv_type {
+@@ -1889,6 +1891,11 @@ struct net_device {
        const struct tlsdev_ops *tlsdev_ops;
  #endif
  
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        const struct header_ops *header_ops;
  
        unsigned int            flags;
-@@ -1964,6 +1971,10 @@ struct net_device {
+@@ -1971,6 +1978,10 @@ struct net_device {
        struct mpls_dev __rcu   *mpls_ptr;
  #endif
  
diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 47e12b0166a007f687481063dd4d91e73c0896c5..ac7a24a049bdba4c4650178ffaf0cff4899e6f0c 100644 (file)
--- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1924,6 +1924,8 @@ struct net_device {
+@@ -1931,6 +1931,8 @@ struct net_device {
        struct netdev_hw_addr_list      mc;
        struct netdev_hw_addr_list      dev_addrs;
  
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index 6392b9d7562dfb41fc4a02703dfc5d0e5b86a15d..a6ef897869ecb79e3fc873ceee22a76ce564a3ad 100644 (file)
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  
  enum gro_result {
-@@ -2092,6 +2095,7 @@ struct net_device {
+@@ -2101,6 +2104,7 @@ struct net_device {
        struct lock_class_key   addr_list_lock_key;
        bool                    proto_down;
        unsigned                wol_enabled:1;
@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  };
  #define to_net_dev(d) container_of(d, struct net_device, dev)
  
-@@ -2249,6 +2253,26 @@ void netif_napi_add(struct net_device *d
+@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d
                    int (*poll)(struct napi_struct *, int), int weight);
  
  /**
diff --git a/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch b/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
index 88692a20209c2c21f9825e38614d615c4a0d7e2f..6f30ee2fea032777e7625d9e2529af288ab4b743 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch
@@ -7,11 +7,11 @@ This patch fixes the checkpatch warnings about too long lines.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- drivers/net/can/rx-offload.c | 39 ++++++++++++++++++++++++++-------------
+ drivers/net/can/dev/rx-offload.c | 39 ++++++++++++++++++++++++++-------------
  1 file changed, 26 insertions(+), 13 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -1,7 +1,8 @@
  // SPDX-License-Identifier: GPL-2.0-only
 -/*
diff --git a/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch b/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
index 26d4a90576c5517b6c14d0b611abbb4a2472ee21..5861dbe0d314b2913cd62b2e97d759e5cf287a9a 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch
@@ -7,11 +7,11 @@ This patch fixes a typo found by checkpatch.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- drivers/net/can/rx-offload.c | 2 +-
+ drivers/net/can/dev/rx-offload.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct
        cb_a = can_rx_offload_get_cb(a);
        cb_b = can_rx_offload_get_cb(b);
diff --git a/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch b/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
index 77cc9f8e1cd90fee5253184436ece240f2cc6288..4501020414282bd11221c7c879bb5cdbe76d74d7 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch
@@ -8,11 +8,11 @@ This patch moves the assignment of queue_len out of the if condition.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- drivers/net/can/rx-offload.c | 4 ++--
+ drivers/net/can/dev/rx-offload.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -238,8 +238,8 @@ int can_rx_offload_irq_offload_timestamp
                skb_queue_splice_tail(&skb_queue, &offload->skb_queue);
                spin_unlock_irqrestore(&offload->skb_queue.lock, flags);
diff --git a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
index 45a20c4af61ddd96d00f6a7ef4fc1bab1aab9c94..68e5c4c604fe71000d05ac3a3f32ade357181038 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch
@@ -9,12 +9,12 @@ nothing. If we ever need this function, add it back again.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- drivers/net/can/rx-offload.c   | 7 -------
+ drivers/net/can/dev/rx-offload.c   | 7 -------
  include/linux/can/rx-offload.h | 1 -
  2 files changed, 8 deletions(-)
 
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str
        offload->skb_queue_len_max *= 4;
        skb_queue_head_init(&offload->skb_queue);
diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
index 09961c88d8f45c0a4437bd786626e0a9f2708967..d5c88ac0c84528766f0abdef85b10a89f83c74e6 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch
@@ -19,7 +19,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  drivers/net/can/flexcan.c      | 27 +++++++++++-----
- drivers/net/can/rx-offload.c   | 70 ++++++++++--------------------------------
+ drivers/net/can/dev/rx-offload.c   | 70 ++++++++++--------------------------------
  include/linux/can/rx-offload.h |  6 ++--
  3 files changed, 40 insertions(+), 63 deletions(-)
 
@@ -98,8 +98,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  }
  
  
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -139,71 +139,35 @@ static int can_rx_offload_compare(struct
  static struct sk_buff *
  can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n)
diff --git a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
index 1f4515ab7e09af6d0a40f2c42bc39e615ccaaa46..1e2a89d9135e99c2e163b09b529baca2fc9b8539 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch
@@ -10,7 +10,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  drivers/net/can/flexcan.c    | 34 +++++++++++++++++-----------------
- drivers/net/can/rx-offload.c |  4 ++--
+ drivers/net/can/dev/rx-offload.c |  4 ++--
  2 files changed, 19 insertions(+), 19 deletions(-)
 
 --- a/drivers/net/can/flexcan.c
@@ -97,8 +97,8 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        }
  
   mark_as_read:
---- a/drivers/net/can/rx-offload.c
-+++ b/drivers/net/can/rx-offload.c
+--- a/drivers/net/can/dev/rx-offload.c
++++ b/drivers/net/can/dev/rx-offload.c
 @@ -51,11 +51,11 @@ static int can_rx_offload_napi_poll(stru
  
        while ((work_done < quota) &&
OpenWrt Source Repository