kernel: bump to 4.9.316, 4.14.281, 4.19.245

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-05-27 23:40:09 +08:00
parent e717229d7f
commit cf3914cafe
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 19 additions and 19 deletions

View File

@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .313
LINUX_VERSION-4.14 = .278
LINUX_VERSION-4.19 = .242
LINUX_VERSION-4.9 = .316
LINUX_VERSION-4.14 = .281
LINUX_VERSION-4.19 = .245
LINUX_KERNEL_HASH-4.9.313 = e03b777861fae559cb7ed635500cde305bc2ca34dee4dc2fe806de0060c87bdc
LINUX_KERNEL_HASH-4.14.278 = 3cd6d4eeb3a5d1c906b35c08f0d602f329410c291233bee1a7a2b168c7378bbe
LINUX_KERNEL_HASH-4.19.242 = 59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2
LINUX_KERNEL_HASH-4.9.316 = 57b698920b2c66b2615d0aa3fd551084560fee901552aff6d89d3553653bcd17
LINUX_KERNEL_HASH-4.14.281 = 3ae2f9c6966b9b19d27de7d84a4b1697df84a9658c34b850a51673266a583b5e
LINUX_KERNEL_HASH-4.19.245 = 99fddd6027ce924abe9f0435027fc517983b0399787efa44d0bac26e22c3a8e8
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

View File

@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -170,6 +170,7 @@ int br_handle_frame_finish(struct net *n
@@ -177,6 +177,7 @@ int br_handle_frame_finish(struct net *n
goto drop;
BR_INPUT_SKB_CB(skb)->brdev = br->dev;

View File

@ -1304,7 +1304,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
adapter->rx_last_jiffies = jiffies;
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1873,7 +1873,7 @@ vmxnet3_poll(struct napi_struct *napi, i
@@ -1879,7 +1879,7 @@ vmxnet3_poll(struct napi_struct *napi, i
rxd_done = vmxnet3_do_poll(rx_queue->adapter, budget);
if (rxd_done < budget) {
@ -1313,7 +1313,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
vmxnet3_enable_all_intrs(rx_queue->adapter);
}
return rxd_done;
@@ -1904,7 +1904,7 @@ vmxnet3_poll_rx_only(struct napi_struct
@@ -1910,7 +1910,7 @@ vmxnet3_poll_rx_only(struct napi_struct
rxd_done = vmxnet3_rq_rx_complete(rq, adapter, budget);
if (rxd_done < budget) {

View File

@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -166,10 +166,14 @@ int br_handle_frame_finish(struct net *n
@@ -173,10 +173,14 @@ int br_handle_frame_finish(struct net *n
}
}

View File

@ -12,7 +12,7 @@ Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -108,10 +108,14 @@ int br_handle_frame_finish(struct net *n
@@ -115,10 +115,14 @@ int br_handle_frame_finish(struct net *n
}
}

View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -237,7 +237,10 @@ static void __br_handle_local_finish(str
@@ -244,7 +244,10 @@ static void __br_handle_local_finish(str
/* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* return 1 to signal the okfn() was called so it's ok to use the skb */
return 1;
@@ -332,6 +335,15 @@ rx_handler_result_t br_handle_frame(stru
@@ -339,6 +342,15 @@ rx_handler_result_t br_handle_frame(stru
forward:
switch (p->state) {

View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -193,6 +193,9 @@ static void __br_handle_local_finish(str
@@ -200,6 +200,9 @@ static void __br_handle_local_finish(str
/* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__br_handle_local_finish(skb);
/* return 1 to signal the okfn() was called so it's ok to use the skb */
@@ -289,6 +292,17 @@ rx_handler_result_t br_handle_frame(stru
@@ -296,6 +299,17 @@ rx_handler_result_t br_handle_frame(stru
forward:
switch (p->state) {

View File

@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/* the pci enable helper */
static int pci_enable(struct clk *clk)
{
@@ -567,4 +586,5 @@ void __init ltq_soc_init(void)
@@ -581,4 +600,5 @@ void __init ltq_soc_init(void)
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0);
}

View File

@ -1,6 +1,6 @@
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -424,6 +424,20 @@ static void clkdev_add_clkout(void)
@@ -438,6 +438,20 @@ static void clkdev_add_clkout(void)
}
}
@ -21,7 +21,7 @@
/* bring up all register ranges that we need for basic system control */
void __init ltq_soc_init(void)
{
@@ -587,4 +601,6 @@ void __init ltq_soc_init(void)
@@ -601,4 +615,6 @@ void __init ltq_soc_init(void)
clkdev_add_pmu("1e100400.serial", NULL, 1, 0, PMU_ASC0);
}
usb_set_clock();

View File

@ -151019,7 +151019,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
#define NETIF_F_RX_UDP_TUNNEL_PORT __NETIF_F(RX_UDP_TUNNEL_PORT)
+#define NETIF_F_HW_ACCEL_MQ __NETIF_F(HW_ACCEL_MQ)
/* Finds the next feature with the highest number of the range of start till 0.
/* Finds the next feature with the highest number of the range of start-1 till 0.
*/
--- /dev/null
+++ b/include/uapi/linux/fmd/Kbuild