aio-3399b
/
icevel_sv901
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.24 (#11110)

This commit is contained in:
aakkll 2023-04-14 15:10:41 +08:00 committed by GitHub
parent 8f42e0d971
commit 8a9cd422ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 22 additions and 22 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 = .23
LINUX_KERNEL_HASH-6.1.23 = 7458372e8750afe37fd1ac3e7ab3c22f2c6018f760f8134055a03f54aba3ebeb
LINUX_VERSION-6.1 = .24
LINUX_KERNEL_HASH-6.1.24 = aae6a7e38e33589011f5a5c0d7e087c8a26e3daf8d434432ee975ead90546504

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

@ -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
@@ -6658,10 +6658,10 @@ void igb_update_stats(struct igb_adapter
@@ -6656,10 +6656,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;
}
@@ -6674,10 +6674,10 @@ void igb_update_stats(struct igb_adapter
@@ -6672,10 +6672,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 {

4
target/linux/generic/backport-6.1/102-drivers-net-convert-to-boolean-for-the-mac_managed_p.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -700,7 +700,7 @@ static int ax88772_init_phy(struct usbne
@@ -714,7 +714,7 @@ static int ax88772_init_phy(struct usbne
}
phy_suspend(priv->phydev);
@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
phy_attached_info(priv->phydev);
@@ -720,7 +720,7 @@ static int ax88772_init_phy(struct usbne
@@ -734,7 +734,7 @@ static int ax88772_init_phy(struct usbne
return -ENODEV;
}

2
target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3460,6 +3460,9 @@ static int mv88e6xxx_setup_port(struct m
@@ -3465,6 +3465,9 @@ static int mv88e6xxx_setup_port(struct m
else
reg = 1 << port;

2
target/linux/generic/hack-6.1/902-debloat_proc.patch
View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -4177,6 +4177,8 @@ static const struct seq_operations vmall
@@ -4179,6 +4179,8 @@ static const struct seq_operations vmall
static int __init proc_vmalloc_init(void)
{

2
target/linux/generic/hack-6.1/904-debloat_dma_buf.patch
View File

@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4360,6 +4360,7 @@ int wake_up_state(struct task_struct *p,
@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}

2
target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7894,7 +7894,7 @@ static void __init alloc_node_mem_map(st
@@ -7895,7 +7895,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

2
target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2199,6 +2199,10 @@ mt7530_setup(struct dsa_switch *ds)
@@ -2195,6 +2195,10 @@ mt7530_setup(struct dsa_switch *ds)
return -ENODEV;
}

4
target/linux/generic/pending-6.1/732-13-net-ethernet-mtk_eth_soc-fix-flow_offload-related-re.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
@@ -554,6 +554,7 @@
@@ -554,6 +554,7 @@ mtk_eth_setup_tc_block(struct net_device
struct mtk_eth *eth = mac->hw;
static LIST_HEAD(block_cb_list);
struct flow_block_cb *block_cb;
@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
flow_setup_cb_t *cb;
if (!eth->soc->offload_version)
@@ -568,17 +569,19 @@
@@ -568,17 +569,19 @@ mtk_eth_setup_tc_block(struct net_device
switch (f->command) {
case FLOW_BLOCK_BIND:
block_cb = flow_block_cb_lookup(f->block, cb, dev);

2
target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6965,6 +6965,7 @@ static int mv88e6xxx_register_switch(str
@@ -6970,6 +6970,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

2
target/linux/generic/pending-6.1/994-add-quectel-rm500u-support.patch
View File

@ -8,7 +8,7 @@
#define QUECTEL_PRODUCT_EC200U 0x0901
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
#define QUECTEL_PRODUCT_EC200T 0x6026
@@ -1202,6 +1203,7 @@ static const struct usb_device_id option
@@ -1204,6 +1205,7 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },

8
target/linux/rockchip/patches-6.1/101-net-realtek-r8169-add-LED-configuration-from-OF.patch
View File

@ -8,7 +8,7 @@
#include <linux/if_vlan.h>
#include <linux/in.h>
#include <linux/io.h>
@@ -183,6 +184,7 @@ enum rtl_registers {
@@ -171,6 +172,7 @@ enum rtl_registers {
MAR0 = 8, /* Multicast filter. */
CounterAddrLow = 0x10,
CounterAddrHigh = 0x14,
@ -16,8 +16,8 @@
TxDescStartAddrLow = 0x20,
TxDescStartAddrHigh = 0x24,
TxHDescStartAddrLow = 0x28,
@@ -5274,6 +5276,22 @@ done:
return false;
@@ -5133,6 +5135,22 @@ static bool rtl_aspm_is_safe(struct rtl8
return false;
}
+static int rtl_led_configuration(struct rtl8169_private *tp)
@ -39,7 +39,7 @@
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct rtl8169_private *tp;
@@ -5438,6 +5456,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct
@@ -5306,6 +5324,7 @@ static int rtl_init_one(struct pci_dev *
if (!tp->counters)
return -ENOMEM;

6
target/linux/rockchip/patches-6.1/120-arm64-dts-rockchip-rk3568-remove-scmi-clk.patch
View File

@ -33,7 +33,7 @@
#cooling-cells = <2>;
enable-method = "psci";
operating-points-v2 = <&cpu0_opp_table>;
@@ -136,6 +139,7 @@
@@ -141,6 +144,7 @@
shmem = <&scmi_shmem>;
#address-cells = <1>;
#size-cells = <0>;
@ -41,7 +41,7 @@
scmi_clk: protocol@14 {
reg = <0x14>;
@@ -193,6 +197,7 @@
@@ -248,6 +252,7 @@
scmi_shmem: sram@0 {
compatible = "arm,scmi-shmem";
reg = <0x0 0x100>;
@ -51,7 +51,7 @@
--- a/drivers/clk/rockchip/clk-rk3568.c
+++ b/drivers/clk/rockchip/clk-rk3568.c
@@ -150,6 +150,12 @@ static struct rockchip_pll_rate_table rk3568_pll_rates[] = {
@@ -156,6 +156,12 @@ static struct rockchip_pll_rate_table rk
}
static struct rockchip_cpuclk_rate_table rk3568_cpuclk_rates[] __initdata = {