kernel: bump 4.14 to 4.14.103
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
parent
151d806c78
commit
ceed0665cc
@ -4,12 +4,12 @@ LINUX_RELEASE?=1
|
||||
|
||||
LINUX_VERSION-3.18 = .136
|
||||
LINUX_VERSION-4.9 = .160
|
||||
LINUX_VERSION-4.14 = .102
|
||||
LINUX_VERSION-4.14 = .103
|
||||
LINUX_VERSION-4.19 = .24
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
|
||||
LINUX_KERNEL_HASH-4.9.160 = c09af067af62d299f5e33c279968de58c88fb7c59bd05e8f3bb460f611f60515
|
||||
LINUX_KERNEL_HASH-4.14.102 = d8a982cfa2804edc2ae9d20792ab0e3897f3976ced5632f2392c2e1918562501
|
||||
LINUX_KERNEL_HASH-4.14.103 = 7aa43e34e4c9e5965da29cef5ae196e06006f8c0d1d65fd755a2f197f0796a11
|
||||
LINUX_KERNEL_HASH-4.19.24 = 3bb1885fabd874b469a8ea19571c5a4ad5b6faa3cca1662137c57b40fcbf8e04
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
#include <net/protocol.h>
|
||||
#include <net/dst.h>
|
||||
@@ -499,6 +500,22 @@ skb_fail:
|
||||
@@ -503,6 +504,22 @@ skb_fail:
|
||||
}
|
||||
EXPORT_SYMBOL(__napi_alloc_skb);
|
||||
|
||||
|
@ -522,7 +522,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
}
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -799,6 +799,32 @@ void napi_consume_skb(struct sk_buff *sk
|
||||
@@ -803,6 +803,32 @@ void napi_consume_skb(struct sk_buff *sk
|
||||
}
|
||||
EXPORT_SYMBOL(napi_consume_skb);
|
||||
|
||||
@ -555,7 +555,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
/* Make sure a field is enclosed inside headers_start/headers_end section */
|
||||
#define CHECK_SKB_FIELD(field) \
|
||||
BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
|
||||
@@ -1318,7 +1344,7 @@ static void skb_headers_offset_update(st
|
||||
@@ -1322,7 +1348,7 @@ static void skb_headers_offset_update(st
|
||||
skb->inner_mac_header += off;
|
||||
}
|
||||
|
||||
@ -564,7 +564,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
{
|
||||
__copy_skb_header(new, old);
|
||||
|
||||
@@ -1326,6 +1352,7 @@ static void copy_skb_header(struct sk_bu
|
||||
@@ -1330,6 +1356,7 @@ static void copy_skb_header(struct sk_bu
|
||||
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
|
||||
skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;
|
||||
}
|
||||
|
@ -150624,7 +150624,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
+#endif /* FSL_USDPAA_H */
|
||||
--- a/include/linux/netdev_features.h
|
||||
+++ b/include/linux/netdev_features.h
|
||||
@@ -77,6 +77,7 @@ enum {
|
||||
@@ -79,6 +79,7 @@ enum {
|
||||
NETIF_F_HW_ESP_BIT, /* Hardware ESP transformation offload */
|
||||
NETIF_F_HW_ESP_TX_CSUM_BIT, /* ESP with TX checksum offload */
|
||||
NETIF_F_RX_UDP_TUNNEL_PORT_BIT, /* Offload of RX port for UDP tunnels */
|
||||
@ -150632,14 +150632,14 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
|
||||
/*
|
||||
* Add your fresh new feature above and remember to update
|
||||
@@ -142,6 +143,7 @@ enum {
|
||||
@@ -144,6 +145,7 @@ enum {
|
||||
#define NETIF_F_HW_ESP __NETIF_F(HW_ESP)
|
||||
#define NETIF_F_HW_ESP_TX_CSUM __NETIF_F(HW_ESP_TX_CSUM)
|
||||
#define NETIF_F_RX_UDP_TUNNEL_PORT __NETIF_F(RX_UDP_TUNNEL_PORT)
|
||||
+#define NETIF_F_HW_ACCEL_MQ __NETIF_F(HW_ACCEL_MQ)
|
||||
|
||||
#define for_each_netdev_feature(mask_addr, bit) \
|
||||
for_each_set_bit(bit, (unsigned long *)mask_addr, NETDEV_FEATURE_COUNT)
|
||||
/* Finds the next feature with the highest number of the range of start till 0.
|
||||
*/
|
||||
--- /dev/null
|
||||
+++ b/include/uapi/linux/fmd/Kbuild
|
||||
@@ -0,0 +1,5 @@
|
||||
|
@ -78,7 +78,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
DP_ERR(p_hwfn,
|
||||
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
|
||||
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
|
||||
@@ -89,6 +89,11 @@ static int xgmiitorgmii_probe(struct mdi
|
||||
@@ -92,6 +92,11 @@ static int xgmiitorgmii_probe(struct mdi
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user