forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kernel: bump 5.4 to 5.4.263 (coolsnowwolf#11695)
- Loading branch information
Showing
8 changed files
with
26 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.4 = .260 | ||
LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe | ||
LINUX_VERSION-5.4 = .263 | ||
LINUX_KERNEL_HASH-5.4.263 = 50d0db9a94118b2d45f2ea1ed7b094cfd39f32829e4a2b51473dd3a8257735f8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1000,7 +1000,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
u32 mahr = ravb_read(ndev, MAHR); | ||
u32 malr = ravb_read(ndev, MALR); | ||
|
||
@@ -2154,7 +2156,7 @@ static int ravb_probe(struct platform_de | ||
@@ -2165,7 +2167,7 @@ static int ravb_probe(struct platform_de | ||
priv->msg_enable = RAVB_DEF_MSG_ENABLE; | ||
|
||
/* Read and set MAC address */ | ||
|
@@ -1302,7 +1302,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
int irq; | ||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||
@@ -4477,7 +4477,7 @@ int stmmac_dvr_probe(struct device *devi | ||
@@ -4519,7 +4519,7 @@ int stmmac_dvr_probe(struct device *devi | ||
priv->wol_irq = res->wol_irq; | ||
priv->lpi_irq = res->lpi_irq; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <linux/mutex.h> | ||
#include <linux/err.h> | ||
#include <linux/of.h> | ||
@@ -3120,3 +3121,5 @@ static int __init regmap_initcall(void) | ||
@@ -3122,3 +3123,5 @@ static int __init regmap_initcall(void) | ||
return 0; | ||
} | ||
postcore_initcall(regmap_initcall); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -110,15 +110,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]> | |
|
||
--- a/include/uapi/linux/netfilter/nf_tables.h | ||
+++ b/include/uapi/linux/netfilter/nf_tables.h | ||
@@ -1516,6 +1516,7 @@ enum nft_object_attributes { | ||
@@ -1517,6 +1517,7 @@ enum nft_object_attributes { | ||
* @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32) | ||
* @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32) | ||
* @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64) | ||
+ * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32) | ||
*/ | ||
enum nft_flowtable_attributes { | ||
NFTA_FLOWTABLE_UNSPEC, | ||
@@ -1525,6 +1526,7 @@ enum nft_flowtable_attributes { | ||
@@ -1526,6 +1527,7 @@ enum nft_flowtable_attributes { | ||
NFTA_FLOWTABLE_USE, | ||
NFTA_FLOWTABLE_HANDLE, | ||
NFTA_FLOWTABLE_PAD, | ||
|
@@ -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 | ||
@@ -5889,6 +5889,13 @@ static int nf_tables_flowtable_parse_hoo | ||
@@ -5974,6 +5974,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; | ||
@@ -6024,10 +6031,19 @@ static int nf_tables_newflowtable(struct | ||
@@ -6118,10 +6125,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) | ||
@@ -6150,7 +6166,8 @@ static int nf_tables_fill_flowtable_info | ||
@@ -6247,7 +6263,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), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <[email protected]> | |
|
||
--- a/drivers/mmc/core/core.c | ||
+++ b/drivers/mmc/core/core.c | ||
@@ -1377,6 +1377,8 @@ void mmc_power_off(struct mmc_host *host | ||
@@ -1380,6 +1380,8 @@ void mmc_power_off(struct mmc_host *host | ||
|
||
mmc_pwrseq_power_off(host); | ||
|
||
|