kernel: bump 6.1 to 6.1.76
authorJohn Audia <therealgraysky@proton.me>
Fri, 2 Feb 2024 21:56:39 +0000 (16:56 -0500)
committerNick Hainke <vincent@systemli.org>
Thu, 8 Feb 2024 17:35:42 +0000 (18:35 +0100)
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>
20 files changed:
include/kernel-6.1
target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
target/linux/bcm27xx/patches-6.1/950-0791-serial-sc16is7xx-Read-modem-line-state-at-startup.patch
target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
target/linux/generic/backport-6.1/828-v6.4-0003-of-Rename-of_modalias_node.patch
target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch
target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
target/linux/generic/hack-6.1/902-debloat_proc.patch
target/linux/generic/pending-6.1/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
target/linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch
target/linux/generic/pending-6.1/790-bus-mhi-core-add-SBL-state-callback.patch
target/linux/mediatek/patches-6.1/432-drivers-spi-Add-support-for-dynamic-calibration.patch
target/linux/mediatek/patches-6.1/901-arm-add-cmdline-override.patch

index b6c55613b654a9ee271726a14cd787212e06f0aa..4abd9f431083bef26193e7096f7e85c5d740d3b4 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .75
-LINUX_KERNEL_HASH-6.1.75 = 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56
+LINUX_VERSION-6.1 = .76
+LINUX_KERNEL_HASH-6.1.76 = 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd
index 2235c28fd96adb525410851ac4975d4d077a0e88..b6f6d63f6847252fc6d08025f863d2ca5a24878e 100644 (file)
@@ -336,7 +336,7 @@ SVN-Revision: 35130
  #endif /* _LINUX_TYPES_H */
 --- a/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)))
                goto out;
  
index 09402fbc351d41b8339d73d66d09db3d7e7577d8..476a3caf3cd0f75d2012d694c2700e475cff2336 100644 (file)
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
                                      unsigned int part_type);
  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;
        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.
-@@ -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))
                return -ENODEV;
  
@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  
        card->complete_wq = alloc_workqueue("mmc_complete",
                                        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;
        }
  
index 974a516829b379e834873ac0fb22e5f817ee2303..ef96ffe86e132d5b91e57726cc7272382f298a92 100644 (file)
@@ -32,7 +32,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/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)
  {
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
        unsigned        bad_bits, ugly_bits;
        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_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
                return -EINVAL;
index 3b663351e2f5eb4e5df2c999e0ebdd4c68868f5c..d0eecb7ee875ac2ad53eec77cf85d49b7bf97985 100644 (file)
@@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  static const struct display_timing rocktech_rk070er9427_timing = {
        .pixelclock = { 26400000, 33300000, 46800000 },
        .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",
                .data = &qishenglong_gopher2b_lcd,
        }, {
index aa446c3346d880969a805853f4237bdc51ee5b62..fa850a4fd9aee31c20be651b9df2bd199d8e7b77 100644 (file)
@@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
  static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
        .clock = 9000,
        .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",
                .data = &friendlyarm_hd702e,
        }, {
index 0335f0019824fa94743d6ed07c544f0f37d87e10..8fa58f83270317dfd1b683f6228ecbc5e9383f08 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/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;
        }
  
index 505121f4cfdb33b81131ab4c7afaf5935c1b510c..93da3ce94d3bcca6ead7902d1680588bc9560678 100644 (file)
@@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static const struct drm_display_mode innolux_at070tn92_mode = {
        .clock = 33333,
        .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",
                .data = &innolux_at043tn24,
        }, {
index 148134f0a22a0828806bd0e663b9945fb65da9af..291302306cd445bb2c71139673e1de84b54aac25 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 --- a/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_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);
 +
        /* Enable modem status polling */
-       spin_lock_irqsave(&port->lock, flags);
+       uart_port_lock_irqsave(port, &flags);
        sc16is7xx_enable_ms(port);
index d914ab6d040c982a4d533438606a477566ba0dca..9122d7347607d715362c0762aba71de50a56f72b 100644 (file)
@@ -23,7 +23,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
  
  /**
   * 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,
  };
  
@@ -33,7 +33,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
  static const struct of_device_id dsi_of_match[] = {
        {
                .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",
                .data = &osd101t2045_53ts
        }, {
@@ -152,7 +152,7 @@ Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
        const struct of_device_id *id;
        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)
                return -ENODEV;
  
index 15af039a16f01d3b81c5626a5b5a0e9eee35d858..671556fbaa8228a5ac4f63828a0e8dd8e7cc723b 100644 (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
 --- a/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 */
index 1258f64722a526f52ba1778af17e3f2df0278965..3e45646fdb7bb50dddb1ef25b0862bb4a17cf39d 100644 (file)
@@ -105,7 +105,7 @@ Subject: [PATCH] kernel: add block fit partition parser
        /* everything is up and running, commence */
        err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
        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))
                md_autodetect_dev(part->bd_dev);
  
index ffa6e8ac60dbe9f6f00664abf362d29fb71d55b9..ec71f9af4be03e1d8639e5e8ed4a01c8480f3568 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  obj-$(CONFIG_PROC_FS) += net-procfs.o
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -114,6 +114,7 @@
+@@ -115,6 +115,7 @@
  #include <linux/memcontrol.h>
  #include <linux/prefetch.h>
  #include <linux/compat.h>
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  #include <linux/uaccess.h>
  
-@@ -145,6 +146,7 @@
+@@ -146,6 +147,7 @@
  
  static DEFINE_MUTEX(proto_list_mutex);
  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(struct sock *sk);
-@@ -584,6 +586,18 @@ discard_and_relse:
+@@ -585,6 +587,18 @@ discard_and_relse:
  }
  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 *,
                                                          u32));
  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))
                sock_inuse_add(sock_net(sk), -1);
  
index 0d844994aaed8ebe1b1a51f4e029867e1b4f8ff8..a90169efc9c202781a3ed2555c08f8c3c894743d 100644 (file)
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/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)
  {
index 47c742cff0689bcb882945429aa90a9d24c9fccc..a3897a9fd1096e47604ba5da4ed60b882b5919ae 100644 (file)
@@ -59,7 +59,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  }
 --- a/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,
  };
  
index 683df4df83293b98312550c539025fa52ccd597d..7b1571ea6ecf2257bdc046a3974320f620271a44 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/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,
                                                  hook->ops.dev,
                                                  FLOW_BLOCK_BIND);
index 944e4d186978926411c9444b431b050d16a219ea..42c8519c9055d1d96db791bcaa604b70baf12ebb 100644 (file)
@@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #ifdef CONFIG_RPS
        remsd = oldsd->rps_ipi_list;
        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);
                spin_lock_init(&sd->defer_lock);
  
index 874df43e7ce6fcad937dcedb2ef8972fc72c0146..f239355594ad530e22e0efeba95da85f500a15db 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
 
 --- a/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) {
                        case MHI_EE_SBL:
                                st = DEV_ST_TRANSITION_SBL;
index 9aeeb786589bcdf184700d43fe9007267d0af941..b2c9df4386a446f510d676c3b886cb5f0c2e819f 100644 (file)
@@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static void _spi_transfer_delay_ns(u32 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)
@@ -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,
                           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)
                goto err_out;
  
index 72e4d1500950f8c16129607ab7877a616152a91d..bfca4b63894b500df6770dbfc56dd80cde7f25f4 100644 (file)
@@ -37,7 +37,7 @@
         * CONFIG_CMDLINE is meant to be a default in case nothing else
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -2236,6 +2236,14 @@ config CMDLINE_FORCE
+@@ -2240,6 +2240,14 @@ config CMDLINE_FORCE
  
  endchoice