kernel: bump 6.1 to 6.1.5

This commit is contained in:
DHDAXCW 2023-01-12 15:32:35 +00:00
parent 9ef2003b8a
commit 644c8bdf95
4 changed files with 6 additions and 6 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .4
LINUX_KERNEL_HASH-6.1.4 = 8aa8f64fa60bb13381a9608d1fefbdd0555e2a70c40b2c7d0671b0d64aa4559e
LINUX_VERSION-6.1 = .5
LINUX_KERNEL_HASH-6.1.5 = bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc

View File

@ -117,7 +117,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3268,10 +3268,10 @@ static void ena_get_stats64(struct net_d
@@ -3305,10 +3305,10 @@ static void ena_get_stats64(struct net_d
tx_ring = &adapter->tx_ring[i];
do {
@ -130,7 +130,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stats->tx_packets += packets;
stats->tx_bytes += bytes;
@@ -3279,20 +3279,20 @@ static void ena_get_stats64(struct net_d
@@ -3316,20 +3316,20 @@ static void ena_get_stats64(struct net_d
rx_ring = &adapter->rx_ring[i];
do {

View File

@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2885,6 +2885,8 @@ static const struct seq_operations locks
@@ -2908,6 +2908,8 @@ static const struct seq_operations locks
static int __init proc_locks_init(void)
{

View File

@ -9,7 +9,7 @@ Subject: [PATCH] of/ftd: add device tree cmdline
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1172,6 +1172,9 @@ int __init early_init_dt_scan_chosen(cha
@@ -1174,6 +1174,9 @@ int __init early_init_dt_scan_chosen(cha
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));