kernel: bump 5.10 to 5.10.198

All patches automatically rebased.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/include/kernel-5.10 b/include/kernel-5.10
index 794011133bbc254ae9dfd87f772b890d2e4f4298..d168a0ee5dd131ec96faead03ed5b58eb30e3b3c 100644 (file)
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .197
-LINUX_KERNEL_HASH-5.10.197 = 183a4507b0ebec7816a79ceba6253aa7ad345e25b0fcd4e834ee154be9a993ab
+LINUX_VERSION-5.10 = .198
+LINUX_KERNEL_HASH-5.10.198 = 2b141fce994364fbbf137b01e7910d3518b8cdbdf18f1811b48470ab4ce2fa05

diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
index 96e8a71232d1b04e6d0ac32fb90d933bf55ce333..64922763f153755d35bf69599d8ec248f11644f4 100644 (file)
--- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
@@ -305,7 +305,7 @@
        list_for_each_entry(p, head, list) {
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt
+@@ -608,48 +608,53 @@ static void tcp_options_write(__be32 *pt
        u16 options = opts->options;    /* mungable copy */
  
        if (unlikely(OPTION_MD5 & options)) {
@@ -382,7 +382,7 @@
        }
  
        if (unlikely(opts->num_sack_blocks)) {
-@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt
+@@ -657,16 +662,17 @@ static void tcp_options_write(__be32 *pt
                        tp->duplicate_sack : tp->selective_acks;
                int this_sack;
  
@@ -406,7 +406,7 @@
                }
  
                tp->rx_opt.dsack = 0;
-@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt
+@@ -679,13 +685,14 @@ static void tcp_options_write(__be32 *pt
  
                if (foc->exp) {
                        len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4133,14 +4133,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4146,14 +4146,16 @@ static bool tcp_parse_aligned_timestamp(
  {
        const __be32 *ptr = (const __be32 *)(th + 1);
  

diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
index d3a35f68edafd15734f20829e666e1194202f82a..ef927528f560ecb5f34d102b8d6f4193069ea89d 100644 (file)
--- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
+++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
@@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/include/net/netfilter/nf_tables.h
 +++ b/include/net/netfilter/nf_tables.h
-@@ -1523,13 +1523,16 @@ struct nft_trans_chain {
+@@ -1479,13 +1479,16 @@ struct nft_trans_chain {
  
  struct nft_trans_table {
        bool                            update;
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        struct nft_set                  *set;
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -1058,6 +1058,12 @@ static void nf_tables_table_disable(stru
+@@ -1074,6 +1074,12 @@ static void nf_tables_table_disable(stru
        nft_table_disable(net, table, 0);
  }
  
@@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int nf_tables_updtable(struct nft_ctx *ctx)
  {
        struct nft_trans *trans;
-@@ -1081,19 +1087,17 @@ static int nf_tables_updtable(struct nft
+@@ -1097,19 +1103,17 @@ static int nf_tables_updtable(struct nft
  
        if ((flags & NFT_TABLE_F_DORMANT) &&
            !(ctx->table->flags & NFT_TABLE_F_DORMANT)) {
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        nft_trans_table_update(trans) = true;
        nft_trans_commit_list_add_tail(ctx->net, trans);
        return 0;
-@@ -8229,11 +8233,10 @@ static int nf_tables_commit(struct net *
+@@ -8475,11 +8479,10 @@ static int nf_tables_commit(struct net *
                switch (trans->msg_type) {
                case NFT_MSG_NEWTABLE:
                        if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                        } else {
                                nft_clear(net, trans->ctx.table);
                        }
-@@ -8452,11 +8455,9 @@ static int __nf_tables_abort(struct net
+@@ -8728,11 +8731,9 @@ static int __nf_tables_abort(struct net
                switch (trans->msg_type) {
                case NFT_MSG_NEWTABLE:
                        if (nft_trans_table_update(trans)) {

diff --git a/target/linux/generic/backport-5.10/614-v5.18-netfilter-flowtable-fix-TCP-flow-teardown.patch b/target/linux/generic/backport-5.10/614-v5.18-netfilter-flowtable-fix-TCP-flow-teardown.patch
index 1b422ca4afae052da9dec50ccce49acd705134a2..dcf29a0c6be034bc39aa68636c025f5c7b95b4af 100644 (file)
--- a/target/linux/generic/backport-5.10/614-v5.18-netfilter-flowtable-fix-TCP-flow-teardown.patch
+++ b/target/linux/generic/backport-5.10/614-v5.18-netfilter-flowtable-fix-TCP-flow-teardown.patch
@@ -156,7 +156,7 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
                                  const struct nft_pktinfo *pkt)
 @@ -293,7 +299,8 @@ static void nft_flow_offload_eval(const
        case IPPROTO_TCP:
-               tcph = skb_header_pointer(pkt->skb, pkt->xt.thoff,
+               tcph = skb_header_pointer(pkt->skb, nft_thoff(pkt),
                                          sizeof(_tcph), &_tcph);
 -              if (unlikely(!tcph || tcph->fin || tcph->rst))
 +              if (unlikely(!tcph || tcph->fin || tcph->rst ||

diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
index 39a24af1044a34ecbdb03c9bccf0565dbf26fa3a..a81b715d26c971e4ae1dd406cfd327844d899e35 100644 (file)
--- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
+++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -1316,7 +1316,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
-@@ -371,7 +371,7 @@ static int stm32_dwmac_probe(struct plat
+@@ -373,7 +373,7 @@ static int stm32_dwmac_probe(struct plat
        if (ret)
                return ret;
  
@@ -1420,7 +1420,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
 +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
-@@ -1713,7 +1713,6 @@ static int am65_cpsw_nuss_init_slave_por
+@@ -1714,7 +1714,6 @@ static int am65_cpsw_nuss_init_slave_por
  
        for_each_child_of_node(node, port_np) {
                struct am65_cpsw_port *port;
@@ -1428,7 +1428,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                u32 port_id;
  
                /* it is not a slave port node, continue */
-@@ -1796,15 +1795,15 @@ static int am65_cpsw_nuss_init_slave_por
+@@ -1797,15 +1796,15 @@ static int am65_cpsw_nuss_init_slave_por
                        goto of_node_put;
                }
  

diff --git a/target/linux/generic/backport-5.10/890-v5.11-net-dsa-mv88e6xxx-Export-VTU-as-devlink-region.patch b/target/linux/generic/backport-5.10/890-v5.11-net-dsa-mv88e6xxx-Export-VTU-as-devlink-region.patch
index a753be340d03467cb31f01c893bb7ebbb0c6fd2b..d2b3ba2106c813998941e753a2f95fe3c0c8fbf6 100644 (file)
--- a/target/linux/generic/backport-5.10/890-v5.11-net-dsa-mv88e6xxx-Export-VTU-as-devlink-region.patch
+++ b/target/linux/generic/backport-5.10/890-v5.11-net-dsa-mv88e6xxx-Export-VTU-as-devlink-region.patch
@@ -167,7 +167,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
                if (IS_ERR(region))
 --- a/drivers/net/dsa/mv88e6xxx/global1.h
 +++ b/drivers/net/dsa/mv88e6xxx/global1.h
-@@ -330,6 +330,8 @@ void mv88e6xxx_g1_atu_prob_irq_free(stru
+@@ -329,6 +329,8 @@ void mv88e6xxx_g1_atu_prob_irq_free(stru
  int mv88e6165_g1_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash);
  int mv88e6165_g1_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash);
  

diff --git a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
index 55700f35204ff495be0fce5fbdbfeaa78f604957..76b6eee0e2c682767fe9686a74efa926de053317 100644 (file)
--- a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2676,6 +2676,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -2678,6 +2678,9 @@ static int mv88e6xxx_setup_port(struct m
        if (dsa_is_cpu_port(ds, port))
                reg = 0;
  

diff --git a/target/linux/generic/pending-5.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-5.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index 36bd2bb589f078c7b84d9ab5f1ef7fe30a154e5e..c00f3a256f4e63ad1ca44ec35fea16f968467b0f 100644 (file)
--- a/target/linux/generic/pending-5.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-5.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1201,6 +1201,73 @@ static struct mtd_info * __init open_mtd
+@@ -1208,6 +1208,73 @@ static struct mtd_info * __init open_mtd
        return mtd;
  }
  
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  static int __init ubi_init(void)
  {
        int err, i, k;
-@@ -1284,6 +1351,12 @@ static int __init ubi_init(void)
+@@ -1291,6 +1358,12 @@ static int __init ubi_init(void)
                }
        }
  

diff --git a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
index a9080ff6adeeaa81d3316e49eb03cdb5ffbbf2e3..3c340221f1bfc9e585777e7e9682ca02027d1d41 100644 (file)
--- a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
+++ b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2894,6 +2894,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2896,6 +2896,7 @@ static int mv88e6xxx_setup(struct dsa_sw
  
        chip->ds = ds;
        ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);

diff --git a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
index 6a99ebc2f88f84aecfff98b3f25cc1d01efd7e1a..405c26a0bc998b6072ef7d93d4c3856a21b2f465 100644 (file)
--- a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
+++ b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5464,6 +5464,7 @@ static int mv88e6xxx_register_switch(str
+@@ -5466,6 +5466,7 @@ static int mv88e6xxx_register_switch(str
        ds->ops = &mv88e6xxx_switch_ops;
        ds->ageing_time_min = chip->info->age_time_coeff;
        ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch
index 20193e43a13d65b15d649485fa7e98c43ea703dd..d7bf73d47744d5cbe084de76106fba6c5d4d8dc0 100644 (file)
--- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch
+++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch
@@ -19,7 +19,7 @@
        },
        [PORT_NPCM] = {
                .name           = "Nuvoton 16550",
-@@ -2720,6 +2720,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2723,6 +2723,11 @@ serial8250_do_set_termios(struct uart_po
        unsigned long flags;
        unsigned int baud, quot, frac = 0;