kernel: bump 5.10 to 5.10.64

All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800
Run-tested: bcm2711/RPi4B, ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
John Audia
2021-09-12 04:54:32 -04:00
committed by Hauke Mehrtens
parent 55643e469c
commit 5fb4cb07e2
11 changed files with 14 additions and 14 deletions

View File

@@ -24,7 +24,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
case CT_DCCP_INVALID:
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8369,6 +8369,7 @@ static int nf_tables_check_loops(const s
@@ -8394,6 +8394,7 @@ static int nf_tables_check_loops(const s
data->verdict.chain);
if (err < 0)
return err;

View File

@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
@@ -7878,11 +7882,10 @@ static int nf_tables_commit(struct net *
@@ -7903,11 +7907,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} else {
nft_clear(net, trans->ctx.table);
}
@@ -8095,11 +8098,9 @@ static int __nf_tables_abort(struct net
@@ -8120,11 +8123,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {

View File

@@ -1586,7 +1586,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev);
temac_do_set_mac_address(ndev);
@@ -1372,7 +1372,7 @@ static int temac_probe(struct platform_d
@@ -1370,7 +1370,7 @@ static int temac_probe(struct platform_d
struct device_node *temac_np = dev_of_node(&pdev->dev), *dma_np;
struct temac_local *lp;
struct net_device *ndev;
@@ -1595,7 +1595,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
__be32 *p;
bool little_endian;
int rc = 0;
@@ -1563,8 +1563,8 @@ static int temac_probe(struct platform_d
@@ -1561,8 +1561,8 @@ static int temac_probe(struct platform_d
if (temac_np) {
/* Retrieve the MAC address */

View File

@@ -1,6 +1,6 @@
--- a/block/blk.h
+++ b/block/blk.h
@@ -357,6 +357,7 @@ char *disk_name(struct gendisk *hd, int
@@ -353,6 +353,7 @@ char *disk_name(struct gendisk *hd, int
#define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2