kernel: bump 6.1 to 6.1.76 (#11858)

This commit is contained in:
Beginner 2024-02-02 11:00:06 +08:00 committed by GitHub
parent d1f7b7d26d
commit e3811adc69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 14 additions and 14 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .75 LINUX_VERSION-6.1 = .76
LINUX_KERNEL_HASH-6.1.75 = 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 LINUX_KERNEL_HASH-6.1.76 = 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd

View File

@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* of_find_node_by_phandle - Find a node given a phandle * of_find_node_by_phandle - Find a node given a phandle
--- a/drivers/spi/spi.c --- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c +++ b/drivers/spi/spi.c
@@ -2326,8 +2326,8 @@ of_register_spi_device(struct spi_contro @@ -2330,8 +2330,8 @@ of_register_spi_device(struct spi_contro
} }
/* Select device driver */ /* Select device driver */

View File

@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser
/* everything is up and running, commence */ /* everything is up and running, commence */
err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL); err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
if (err) if (err)
@@ -585,6 +597,11 @@ static bool blk_add_partition(struct gen @@ -590,6 +602,11 @@ static bool blk_add_partition(struct gen
(state->parts[p].flags & ADDPART_FLAG_RAID)) (state->parts[p].flags & ADDPART_FLAG_RAID))
md_autodetect_dev(part->bd_dev); md_autodetect_dev(part->bd_dev);

View File

@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
obj-$(CONFIG_PROC_FS) += net-procfs.o obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -114,6 +114,7 @@ @@ -115,6 +115,7 @@
#include <linux/memcontrol.h> #include <linux/memcontrol.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <linux/compat.h> #include <linux/compat.h>
@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/uaccess.h> #include <linux/uaccess.h>
@@ -145,6 +146,7 @@ @@ -146,6 +147,7 @@
static DEFINE_MUTEX(proto_list_mutex); static DEFINE_MUTEX(proto_list_mutex);
static LIST_HEAD(proto_list); static LIST_HEAD(proto_list);
@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void sock_def_write_space_wfree(struct sock *sk); static void sock_def_write_space_wfree(struct sock *sk);
static void sock_def_write_space(struct sock *sk); static void sock_def_write_space(struct sock *sk);
@@ -584,6 +586,18 @@ discard_and_relse: @@ -585,6 +587,18 @@ discard_and_relse:
} }
EXPORT_SYMBOL(__sk_receive_skb); EXPORT_SYMBOL(__sk_receive_skb);
@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *, INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32)); u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *, INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
@@ -2187,9 +2201,11 @@ static void __sk_free(struct sock *sk) @@ -2188,9 +2202,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt)) if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1); 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 --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -4113,6 +4113,8 @@ static __net_initdata struct pernet_oper @@ -4114,6 +4114,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void) static int __init proto_init(void)
{ {

View File

@ -17,7 +17,7 @@ Signed-off-by: Steve French <stfrench@microsoft.com>
--- a/fs/smb/server/oplock.c --- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c +++ b/fs/smb/server/oplock.c
@@ -1197,6 +1197,12 @@ int smb_grant_oplock(struct ksmbd_work * @@ -1203,6 +1203,12 @@ int smb_grant_oplock(struct ksmbd_work *
return 0; return 0;
} }

View File

@ -59,7 +59,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} }
--- a/net/netfilter/nft_flow_offload.c --- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c
@@ -470,47 +470,14 @@ static struct nft_expr_type nft_flow_off @@ -475,47 +475,14 @@ static struct nft_expr_type nft_flow_off
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };

View File

@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CONFIG_RPS #ifdef CONFIG_RPS
remsd = oldsd->rps_ipi_list; remsd = oldsd->rps_ipi_list;
oldsd->rps_ipi_list = NULL; oldsd->rps_ipi_list = NULL;
@@ -11486,6 +11560,7 @@ static int __init net_dev_init(void) @@ -11495,6 +11569,7 @@ static int __init net_dev_init(void)
INIT_CSD(&sd->defer_csd, trigger_rx_softirq, sd); INIT_CSD(&sd->defer_csd, trigger_rx_softirq, sd);
spin_lock_init(&sd->defer_lock); spin_lock_init(&sd->defer_lock);

View File

@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/bus/mhi/host/main.c --- a/drivers/bus/mhi/host/main.c
+++ b/drivers/bus/mhi/host/main.c +++ b/drivers/bus/mhi/host/main.c
@@ -900,6 +900,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_ @@ -905,6 +905,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
switch (event) { switch (event) {
case MHI_EE_SBL: case MHI_EE_SBL:
st = DEV_ST_TRANSITION_SBL; st = DEV_ST_TRANSITION_SBL;

View File

@ -1,6 +1,6 @@
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -1165,6 +1165,14 @@ config SOCIONEXT_SYNQUACER_PREITS @@ -1169,6 +1169,14 @@ config SOCIONEXT_SYNQUACER_PREITS
If unsure, say Y. If unsure, say Y.