Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.13

Browse Source
This commit is contained in:
DHDAXCW 2023-02-25 01:41:41 +00:00
parent 2d6a866622
commit 4a56e896f2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .12
LINUX_KERNEL_HASH-6.1.12 = d47aa675170904dcc93eeaa7c96db54d476a11c5d3e8cf3d3b96e364e2a0edea
LINUX_VERSION-6.1 = .13
LINUX_KERNEL_HASH-6.1.13 = 48841319f4b0077da15e4176e624032d8332d961ee660e1b85e1ce73ded17a67

12
target/linux/generic/backport-6.1/101-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
View File

@ -785,7 +785,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
*data += size;
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -6371,10 +6371,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
@@ -6397,10 +6397,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
unsigned int start;
do {
@ -838,7 +838,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
spin_unlock(&adapter->stats64_lock);
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6636,10 +6636,10 @@ void igb_update_stats(struct igb_adapter
@@ -6658,10 +6658,10 @@ void igb_update_stats(struct igb_adapter
}
do {
@ -851,7 +851,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
bytes += _bytes;
packets += _packets;
}
@@ -6652,10 +6652,10 @@ void igb_update_stats(struct igb_adapter
@@ -6674,10 +6674,10 @@ void igb_update_stats(struct igb_adapter
for (i = 0; i < adapter->num_tx_queues; i++) {
struct igb_ring *ring = adapter->tx_ring[i];
do {
@ -960,7 +960,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9041,10 +9041,10 @@ static void ixgbe_get_ring_stats64(struc
@@ -9047,10 +9047,10 @@ static void ixgbe_get_ring_stats64(struc
if (ring) {
do {
@ -973,7 +973,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stats->tx_packets += packets;
stats->tx_bytes += bytes;
}
@@ -9064,10 +9064,10 @@ static void ixgbe_get_stats64(struct net
@@ -9070,10 +9070,10 @@ static void ixgbe_get_stats64(struct net
if (ring) {
do {
@ -1438,7 +1438,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stats->tx_errors = priv->stats_tx.errors;
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1366,12 +1366,12 @@ static void am65_cpsw_nuss_ndo_get_stats
@@ -1376,12 +1376,12 @@ static void am65_cpsw_nuss_ndo_get_stats
cpu_stats = per_cpu_ptr(ndev_priv->stats, cpu);
do {

2
target/linux/generic/pending-6.1/732-06-net-ethernet-mediatek-ppe-assign-per-port-queues-for.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#define MTK_FOE_IB2_DEST_PORT_V2 GENMASK(12, 9)
#define MTK_FOE_IB2_MULTICAST_V2 BIT(13)
#define MTK_FOE_IB2_WDMA_WINFO_V2 BIT(19)
@@ -351,6 +353,8 @@ int mtk_foe_entry_set_pppoe(struct mtk_e
@@ -350,6 +352,8 @@ int mtk_foe_entry_set_pppoe(struct mtk_e
int sid);
int mtk_foe_entry_set_wdma(struct mtk_eth *eth, struct mtk_foe_entry *entry,
int wdma_idx, int txq, int bss, int wcid);

8
target/linux/generic/pending-6.1/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @qc: Metadata associated with the taskfile to build
@@ -4619,6 +4632,9 @@ void __ata_qc_complete(struct ata_queued
@@ -4622,6 +4635,9 @@ void __ata_qc_complete(struct ata_queued
link->active_tag = ATA_TAG_POISON;
ap->nr_active_links--;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/* clear exclusive status */
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
@@ -5325,6 +5341,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5328,6 +5344,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -5360,6 +5379,12 @@ static void ata_host_release(struct kref
@@ -5363,6 +5382,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -5762,7 +5787,23 @@ int ata_host_register(struct ata_host *h
@@ -5765,7 +5790,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}

2
target/linux/rockchip/patches-6.1/211-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View File

@ -782,7 +782,7 @@
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2914,6 +2914,8 @@ static int stmmac_init_dma_engine(struct
@@ -2915,6 +2915,8 @@ static int stmmac_init_dma_engine(struct
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
atds = 1;