kernel: bump 6.1 to 6.1.76
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.76 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
d274867c21
commit
4a0839b44e
|
@ -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
|
||||||
|
|
|
@ -336,7 +336,7 @@ SVN-Revision: 35130
|
||||||
#endif /* _LINUX_TYPES_H */
|
#endif /* _LINUX_TYPES_H */
|
||||||
--- a/net/ipv4/af_inet.c
|
--- a/net/ipv4/af_inet.c
|
||||||
+++ b/net/ipv4/af_inet.c
|
+++ b/net/ipv4/af_inet.c
|
||||||
@@ -1512,8 +1512,8 @@ struct sk_buff *inet_gro_receive(struct
|
@@ -1515,8 +1515,8 @@ struct sk_buff *inet_gro_receive(struct
|
||||||
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
|
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
static inline int mmc_blk_part_switch(struct mmc_card *card,
|
static inline int mmc_blk_part_switch(struct mmc_card *card,
|
||||||
unsigned int part_type);
|
unsigned int part_type);
|
||||||
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
||||||
@@ -3000,6 +3007,8 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -3040,6 +3047,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
{
|
{
|
||||||
struct mmc_blk_data *md;
|
struct mmc_blk_data *md;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check that the card supports the command class(es) we need.
|
* Check that the card supports the command class(es) we need.
|
||||||
@@ -3007,7 +3016,16 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -3047,7 +3056,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
card->complete_wq = alloc_workqueue("mmc_complete",
|
card->complete_wq = alloc_workqueue("mmc_complete",
|
||||||
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
||||||
@@ -3022,6 +3040,17 @@ static int mmc_blk_probe(struct mmc_card
|
@@ -3062,6 +3080,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||||
goto out_free;
|
goto out_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/spi/spi.c
|
--- a/drivers/spi/spi.c
|
||||||
+++ b/drivers/spi/spi.c
|
+++ b/drivers/spi/spi.c
|
||||||
@@ -3675,6 +3675,7 @@ static int spi_set_cs_timing(struct spi_
|
@@ -3679,6 +3679,7 @@ static int spi_set_cs_timing(struct spi_
|
||||||
*/
|
*/
|
||||||
int spi_setup(struct spi_device *spi)
|
int spi_setup(struct spi_device *spi)
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
unsigned bad_bits, ugly_bits;
|
unsigned bad_bits, ugly_bits;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
|
|
||||||
@@ -3695,6 +3696,14 @@ int spi_setup(struct spi_device *spi)
|
@@ -3699,6 +3700,14 @@ int spi_setup(struct spi_device *spi)
|
||||||
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
|
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
|
||||||
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
|
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||||||
static const struct display_timing rocktech_rk070er9427_timing = {
|
static const struct display_timing rocktech_rk070er9427_timing = {
|
||||||
.pixelclock = { 26400000, 33300000, 46800000 },
|
.pixelclock = { 26400000, 33300000, 46800000 },
|
||||||
.hactive = { 800, 800, 800 },
|
.hactive = { 800, 800, 800 },
|
||||||
@@ -4224,6 +4249,9 @@ static const struct of_device_id platfor
|
@@ -4226,6 +4251,9 @@ static const struct of_device_id platfor
|
||||||
.compatible = "qishenglong,gopher2b-lcd",
|
.compatible = "qishenglong,gopher2b-lcd",
|
||||||
.data = &qishenglong_gopher2b_lcd,
|
.data = &qishenglong_gopher2b_lcd,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
|
||||||
static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
|
static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
|
||||||
.clock = 9000,
|
.clock = 9000,
|
||||||
.hdisplay = 480,
|
.hdisplay = 480,
|
||||||
@@ -4108,6 +4134,9 @@ static const struct of_device_id platfor
|
@@ -4110,6 +4136,9 @@ static const struct of_device_id platfor
|
||||||
.compatible = "friendlyarm,hd702e",
|
.compatible = "friendlyarm,hd702e",
|
||||||
.data = &friendlyarm_hd702e,
|
.data = &friendlyarm_hd702e,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/mmc/core/block.c
|
--- a/drivers/mmc/core/block.c
|
||||||
+++ b/drivers/mmc/core/block.c
|
+++ b/drivers/mmc/core/block.c
|
||||||
@@ -1930,7 +1930,7 @@ static void mmc_blk_mq_rw_recovery(struc
|
@@ -1970,7 +1970,7 @@ static void mmc_blk_mq_rw_recovery(struc
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
static const struct drm_display_mode innolux_at070tn92_mode = {
|
static const struct drm_display_mode innolux_at070tn92_mode = {
|
||||||
.clock = 33333,
|
.clock = 33333,
|
||||||
.hdisplay = 800,
|
.hdisplay = 800,
|
||||||
@@ -4144,6 +4176,9 @@ static const struct of_device_id platfor
|
@@ -4146,6 +4178,9 @@ static const struct of_device_id platfor
|
||||||
.compatible = "innolux,at043tn24",
|
.compatible = "innolux,at043tn24",
|
||||||
.data = &innolux_at043tn24,
|
.data = &innolux_at043tn24,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/tty/serial/sc16is7xx.c
|
--- a/drivers/tty/serial/sc16is7xx.c
|
||||||
+++ b/drivers/tty/serial/sc16is7xx.c
|
+++ b/drivers/tty/serial/sc16is7xx.c
|
||||||
@@ -1222,6 +1222,9 @@ static int sc16is7xx_startup(struct uart
|
@@ -1193,6 +1193,9 @@ static int sc16is7xx_startup(struct uart
|
||||||
SC16IS7XX_IER_MSI_BIT;
|
SC16IS7XX_IER_MSI_BIT;
|
||||||
sc16is7xx_port_write(port, SC16IS7XX_IER_REG, val);
|
sc16is7xx_port_write(port, SC16IS7XX_IER_REG, val);
|
||||||
|
|
||||||
|
@ -24,5 +24,5 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
+ one->old_mctrl = sc16is7xx_get_hwmctrl(port);
|
+ one->old_mctrl = sc16is7xx_get_hwmctrl(port);
|
||||||
+
|
+
|
||||||
/* Enable modem status polling */
|
/* Enable modem status polling */
|
||||||
spin_lock_irqsave(&port->lock, flags);
|
uart_port_lock_irqsave(port, &flags);
|
||||||
sc16is7xx_enable_ms(port);
|
sc16is7xx_enable_ms(port);
|
||||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct panel_desc - Describes a simple panel.
|
* struct panel_desc - Describes a simple panel.
|
||||||
@@ -4660,6 +4661,9 @@ static const struct panel_desc_dsi osd10
|
@@ -4662,6 +4663,9 @@ static const struct panel_desc_dsi osd10
|
||||||
.lanes = 4,
|
.lanes = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
|
||||||
static const struct of_device_id dsi_of_match[] = {
|
static const struct of_device_id dsi_of_match[] = {
|
||||||
{
|
{
|
||||||
.compatible = "auo,b080uan01",
|
.compatible = "auo,b080uan01",
|
||||||
@@ -4683,14 +4687,118 @@ static const struct of_device_id dsi_of_
|
@@ -4685,14 +4689,118 @@ static const struct of_device_id dsi_of_
|
||||||
.compatible = "osddisplays,osd101t2045-53ts",
|
.compatible = "osddisplays,osd101t2045-53ts",
|
||||||
.data = &osd101t2045_53ts
|
.data = &osd101t2045_53ts
|
||||||
}, {
|
}, {
|
||||||
|
@ -152,7 +152,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
|
||||||
const struct of_device_id *id;
|
const struct of_device_id *id;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
@@ -4698,7 +4806,20 @@ static int panel_simple_dsi_probe(struct
|
@@ -4700,7 +4808,20 @@ static int panel_simple_dsi_probe(struct
|
||||||
if (!id)
|
if (!id)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/netfilter/nf_tables_api.c
|
--- a/net/netfilter/nf_tables_api.c
|
||||||
+++ b/net/netfilter/nf_tables_api.c
|
+++ b/net/netfilter/nf_tables_api.c
|
||||||
@@ -7900,7 +7900,7 @@ static int nft_register_flowtable_net_ho
|
@@ -7904,7 +7904,7 @@ static int nft_register_flowtable_net_ho
|
||||||
err = flowtable->data.type->setup(&flowtable->data,
|
err = flowtable->data.type->setup(&flowtable->data,
|
||||||
hook->ops.dev,
|
hook->ops.dev,
|
||||||
FLOW_BLOCK_BIND);
|
FLOW_BLOCK_BIND);
|
||||||
|
|
|
@ -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;
|
||||||
@@ -11471,6 +11545,7 @@ static int __init net_dev_init(void)
|
@@ -11480,6 +11554,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);
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||||
static void _spi_transfer_delay_ns(u32 ns)
|
static void _spi_transfer_delay_ns(u32 ns)
|
||||||
{
|
{
|
||||||
if (!ns)
|
if (!ns)
|
||||||
@@ -2219,6 +2283,75 @@ void spi_flush_queue(struct spi_controll
|
@@ -2223,6 +2287,75 @@ void spi_flush_queue(struct spi_controll
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#if defined(CONFIG_OF)
|
#if defined(CONFIG_OF)
|
||||||
|
@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||||
static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
|
static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
|
||||||
struct device_node *nc)
|
struct device_node *nc)
|
||||||
{
|
{
|
||||||
@@ -2337,6 +2470,10 @@ of_register_spi_device(struct spi_contro
|
@@ -2341,6 +2474,10 @@ of_register_spi_device(struct spi_contro
|
||||||
if (rc)
|
if (rc)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
||||||
--- a/arch/arm64/Kconfig
|
--- a/arch/arm64/Kconfig
|
||||||
+++ b/arch/arm64/Kconfig
|
+++ b/arch/arm64/Kconfig
|
||||||
@@ -2236,6 +2236,14 @@ config CMDLINE_FORCE
|
@@ -2240,6 +2240,14 @@ config CMDLINE_FORCE
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue