kernel: bump 5.10 to 5.10.130
authorJohn Audia <therealgraysky@proton.me>
Tue, 12 Jul 2022 15:51:28 +0000 (11:51 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 19 Jul 2022 19:31:04 +0000 (21:31 +0200)
All patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800

Signed-off-by: John Audia <therealgraysky@proton.me>
include/kernel-5.10
target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch

index d1a6d5d912b531c6296645d2f7354909a72456c8..0a4d13e10314d00c2fce1399e934d9f641dcbe4f 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .129
-LINUX_KERNEL_HASH-5.10.129 = aae72f052b80858f77d40009faf9ccf09c38c8b33f56346d16c05f7e6a429cfe
+LINUX_VERSION-5.10 = .130
+LINUX_KERNEL_HASH-5.10.130 = e144a6d851a8e2977743d45fdb9cdb1b7f4aabde09533e73c969cded4daa962c
index 40d0206b479aefd186f352612cbc44f4ffe1bf3d..6d338490fbae5bc9e15e4a70eee7201f67d3e5e6 100644 (file)
@@ -256,7 +256,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
        clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
        spin_unlock_irqrestore(&atchan->lock, flags);
  
-@@ -1987,6 +2037,10 @@ static int at_xdmac_probe(struct platfor
+@@ -1992,6 +2042,10 @@ static int at_xdmac_probe(struct platfor
        atxdmac->regs = base;
        atxdmac->irq = irq;
  
@@ -267,7 +267,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
        atxdmac->clk = devm_clk_get(&pdev->dev, "dma_clk");
        if (IS_ERR(atxdmac->clk)) {
                dev_err(&pdev->dev, "can't get dma_clk\n");
-@@ -2129,6 +2183,10 @@ static const struct dev_pm_ops atmel_xdm
+@@ -2134,6 +2188,10 @@ static const struct dev_pm_ops atmel_xdm
  static const struct of_device_id atmel_xdmac_dt_ids[] = {
        {
                .compatible = "atmel,sama5d4-dma",
index faca34ff0914a1cae27d0d437db526857b40797a..463d03a35ebda151ff34d0cf10429f1c1a56fdd5 100644 (file)
@@ -71,7 +71,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  };
  
  static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
-@@ -1998,6 +2019,30 @@ static int atmel_xdmac_resume(struct dev
+@@ -2003,6 +2024,30 @@ static int atmel_xdmac_resume(struct dev
  }
  #endif /* CONFIG_PM_SLEEP */
  
@@ -102,7 +102,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  static int at_xdmac_probe(struct platform_device *pdev)
  {
        struct at_xdmac *atxdmac;
-@@ -2142,6 +2187,8 @@ static int at_xdmac_probe(struct platfor
+@@ -2147,6 +2192,8 @@ static int at_xdmac_probe(struct platfor
        dev_info(&pdev->dev, "%d channels, mapped at 0x%p\n",
                 nr_channels, atxdmac->regs);
  
index e32bcfa4a77fa6b05109e74339c0e16964b686ed..d2076031ca3b86ac80dad51972fc7402a3c50976 100644 (file)
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        nft_trans_table_update(trans) = true;
        list_add_tail(&trans->list, &ctx->net->nft.commit_list);
        return 0;
-@@ -7916,11 +7920,10 @@ static int nf_tables_commit(struct net *
+@@ -7923,11 +7927,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);
                        }
-@@ -8133,11 +8136,9 @@ static int __nf_tables_abort(struct net
+@@ -8140,11 +8143,9 @@ static int __nf_tables_abort(struct net
                switch (trans->msg_type) {
                case NFT_MSG_NEWTABLE:
                        if (nft_trans_table_update(trans)) {