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:
parent
55643e469c
commit
5fb4cb07e2
11 changed files with 14 additions and 14 deletions
|
@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-5.4 = .143
|
LINUX_VERSION-5.4 = .143
|
||||||
LINUX_VERSION-5.10 = .63
|
LINUX_VERSION-5.10 = .64
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-5.4.143 = 0953650b05a5f806d76c5691583e94e141f4f691bc0ba75a60b643740f021d24
|
LINUX_KERNEL_HASH-5.4.143 = 0953650b05a5f806d76c5691583e94e141f4f691bc0ba75a60b643740f021d24
|
||||||
LINUX_KERNEL_HASH-5.10.63 = 19a15e838885a0081de5f9874e608fc3f3b1d9e69f2cc5cfa883b8b5499bcb2e
|
LINUX_KERNEL_HASH-5.10.64 = 3eb84bd24a2de2b4749314e34597c02401c5d6831b055ed5224adb405c35e30a
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
|
|
@ -43,7 +43,7 @@ produce a noisy warning.
|
||||||
hcd->msi_enabled = 1;
|
hcd->msi_enabled = 1;
|
||||||
--- a/drivers/usb/host/xhci.h
|
--- a/drivers/usb/host/xhci.h
|
||||||
+++ b/drivers/usb/host/xhci.h
|
+++ b/drivers/usb/host/xhci.h
|
||||||
@@ -1888,6 +1888,7 @@ struct xhci_hcd {
|
@@ -1891,6 +1891,7 @@ struct xhci_hcd {
|
||||||
struct xhci_hub usb2_rhub;
|
struct xhci_hub usb2_rhub;
|
||||||
struct xhci_hub usb3_rhub;
|
struct xhci_hub usb3_rhub;
|
||||||
/* support xHCI 1.0 spec USB2 hardware LPM */
|
/* support xHCI 1.0 spec USB2 hardware LPM */
|
||||||
|
|
|
@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||||
/*
|
/*
|
||||||
--- a/drivers/usb/host/xhci.h
|
--- a/drivers/usb/host/xhci.h
|
||||||
+++ b/drivers/usb/host/xhci.h
|
+++ b/drivers/usb/host/xhci.h
|
||||||
@@ -1881,6 +1881,7 @@ struct xhci_hcd {
|
@@ -1884,6 +1884,7 @@ struct xhci_hcd {
|
||||||
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
|
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
|
||||||
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
||||||
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
||||||
|
|
|
@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||||
val);
|
val);
|
||||||
--- a/drivers/usb/host/xhci.h
|
--- a/drivers/usb/host/xhci.h
|
||||||
+++ b/drivers/usb/host/xhci.h
|
+++ b/drivers/usb/host/xhci.h
|
||||||
@@ -1650,8 +1650,8 @@ struct urb_priv {
|
@@ -1653,8 +1653,8 @@ struct urb_priv {
|
||||||
* Each segment table entry is 4*32bits long. 1K seems like an ok size:
|
* Each segment table entry is 4*32bits long. 1K seems like an ok size:
|
||||||
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
|
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
|
||||||
* meaning 64 ring segments.
|
* meaning 64 ring segments.
|
||||||
|
|
|
@ -51,7 +51,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci.h
|
--- a/drivers/usb/host/xhci.h
|
||||||
+++ b/drivers/usb/host/xhci.h
|
+++ b/drivers/usb/host/xhci.h
|
||||||
@@ -1882,6 +1882,7 @@ struct xhci_hcd {
|
@@ -1885,6 +1885,7 @@ struct xhci_hcd {
|
||||||
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
||||||
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
||||||
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(41)
|
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(41)
|
||||||
|
|
|
@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-ring.c
|
--- a/drivers/usb/host/xhci-ring.c
|
||||||
+++ b/drivers/usb/host/xhci-ring.c
|
+++ b/drivers/usb/host/xhci-ring.c
|
||||||
@@ -4255,9 +4255,9 @@ void xhci_queue_new_dequeue_state(struct
|
@@ -4256,9 +4256,9 @@ void xhci_queue_new_dequeue_state(struct
|
||||||
}
|
}
|
||||||
ep = &xhci->devs[slot_id]->eps[ep_index];
|
ep = &xhci->devs[slot_id]->eps[ep_index];
|
||||||
if ((ep->ep_state & SET_DEQ_PENDING)) {
|
if ((ep->ep_state & SET_DEQ_PENDING)) {
|
||||||
|
|
|
@ -127,7 +127,7 @@ it on BCM4708 family.
|
||||||
/*
|
/*
|
||||||
--- a/drivers/usb/host/xhci.h
|
--- a/drivers/usb/host/xhci.h
|
||||||
+++ b/drivers/usb/host/xhci.h
|
+++ b/drivers/usb/host/xhci.h
|
||||||
@@ -1881,6 +1881,7 @@ struct xhci_hcd {
|
@@ -1884,6 +1884,7 @@ struct xhci_hcd {
|
||||||
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
|
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
|
||||||
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
|
||||||
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
|
||||||
|
|
|
@ -24,7 +24,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
case CT_DCCP_INVALID:
|
case CT_DCCP_INVALID:
|
||||||
--- a/net/netfilter/nf_tables_api.c
|
--- a/net/netfilter/nf_tables_api.c
|
||||||
+++ b/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);
|
data->verdict.chain);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
|
@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
nft_trans_table_update(trans) = true;
|
nft_trans_table_update(trans) = true;
|
||||||
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
|
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
|
||||||
return 0;
|
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) {
|
switch (trans->msg_type) {
|
||||||
case NFT_MSG_NEWTABLE:
|
case NFT_MSG_NEWTABLE:
|
||||||
if (nft_trans_table_update(trans)) {
|
if (nft_trans_table_update(trans)) {
|
||||||
|
@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
} else {
|
} else {
|
||||||
nft_clear(net, trans->ctx.table);
|
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) {
|
switch (trans->msg_type) {
|
||||||
case NFT_MSG_NEWTABLE:
|
case NFT_MSG_NEWTABLE:
|
||||||
if (nft_trans_table_update(trans)) {
|
if (nft_trans_table_update(trans)) {
|
||||||
|
|
|
@ -1586,7 +1586,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||||
eth_hw_addr_random(ndev);
|
eth_hw_addr_random(ndev);
|
||||||
temac_do_set_mac_address(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 device_node *temac_np = dev_of_node(&pdev->dev), *dma_np;
|
||||||
struct temac_local *lp;
|
struct temac_local *lp;
|
||||||
struct net_device *ndev;
|
struct net_device *ndev;
|
||||||
|
@ -1595,7 +1595,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
__be32 *p;
|
__be32 *p;
|
||||||
bool little_endian;
|
bool little_endian;
|
||||||
int rc = 0;
|
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) {
|
if (temac_np) {
|
||||||
/* Retrieve the MAC address */
|
/* Retrieve the MAC address */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/block/blk.h
|
--- a/block/blk.h
|
||||||
+++ b/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_NONE 0
|
||||||
#define ADDPART_FLAG_RAID 1
|
#define ADDPART_FLAG_RAID 1
|
||||||
#define ADDPART_FLAG_WHOLEDISK 2
|
#define ADDPART_FLAG_WHOLEDISK 2
|
||||||
|
|
Loading…
Reference in a new issue