kernel: bump 6.1 to 6.1.12

This commit is contained in:
DHDAXCW 2023-02-15 01:52:44 +00:00
parent 1d2b74a447
commit 3b14248cad
6 changed files with 8 additions and 8 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .11
LINUX_KERNEL_HASH-6.1.11 = 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1
LINUX_VERSION-6.1 = .12
LINUX_KERNEL_HASH-6.1.12 = d47aa675170904dcc93eeaa7c96db54d476a11c5d3e8cf3d3b96e364e2a0edea

View File

@ -904,7 +904,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
spin_unlock(&adapter->stats64_lock);
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4800,10 +4800,10 @@ void igc_update_stats(struct igc_adapter
@@ -4802,10 +4802,10 @@ void igc_update_stats(struct igc_adapter
}
do {
@ -917,7 +917,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
bytes += _bytes;
packets += _packets;
}
@@ -4817,10 +4817,10 @@ void igc_update_stats(struct igc_adapter
@@ -4819,10 +4819,10 @@ void igc_update_stats(struct igc_adapter
struct igc_ring *ring = adapter->tx_ring[i];
do {

View File

@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
@@ -2172,9 +2186,11 @@ static void __sk_free(struct sock *sk)
@@ -2174,9 +2188,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);

View File

@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -4077,6 +4077,8 @@ static __net_initdata struct pernet_oper
@@ -4078,6 +4078,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

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
@@ -7891,7 +7891,7 @@ static void __init alloc_node_mem_map(st
@@ -7894,7 +7894,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)

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
@@ -2184,6 +2184,10 @@ mt7530_setup(struct dsa_switch *ds)
@@ -2196,6 +2196,10 @@ mt7530_setup(struct dsa_switch *ds)
return -ENODEV;
}