[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  fritz-tools: sync with upstream (coolsnowwolf#10574)
  [WIP] mediatek: add TP-Link TL-XDR6086/TL-XDR6088
  kernel: bump to 5.4.226, 5.10.158, 5.15.82 (coolsnowwolf#10573)

Author: github-actions[bot]

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .157
-LINUX_KERNEL_HASH-5.10.157 = fc4cd7c0777ed53f1350e73877e9918df3c40d8e8abe93c6e1a0eb21556d327f
+LINUX_VERSION-5.10 = .158
+LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .81
-LINUX_KERNEL_HASH-5.15.81 = 8f885cdebd754d6e63b920cf6c3e5713e91bbf5f52e9d99eb0054ef7e8f096ab
+LINUX_VERSION-5.15 = .82
+LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .225
-LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa
+LINUX_VERSION-5.4 = .226
+LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44

package/utils/fritz-tools/src/fritz_tffs_nand_read.c

@@ -73,21 +73,18 @@ static uint8_t readbuf[TFFS_SECTOR_SIZE];
 static uint8_t oobbuf[TFFS_SECTOR_OOB_SIZE];
 static uint32_t blocksize;
 static int mtdfd;
-struct tffs_sectors *sectors;
-
-struct tffs_sectors {
-	uint32_t num_sectors;
-	uint8_t sectors[0];
-};
+static uint32_t num_sectors;
+static uint8_t *sectors;
+static uint32_t *sector_ids;
 
 static inline void sector_mark_bad(int num)
 {
-	sectors->sectors[num / 8] &= ~(0x80 >> (num % 8));
+	sectors[num / 8] &= ~(0x80 >> (num % 8));
 };
 
 static inline uint8_t sector_get_good(int num)
 {
-	return sectors->sectors[num / 8] & 0x80 >> (num % 8);
+	return sectors[num / 8] & 0x80 >> (num % 8);
 };
 
 struct tffs_entry_segment {
@@ -139,6 +136,8 @@ static int read_sector(off_t pos)
 		return -1;
 	}
 
+	sector_ids[pos / TFFS_SECTOR_SIZE] = read_uint32(readbuf, 0x00);
+
 	return 0;
 }
 
@@ -176,25 +175,39 @@ static int find_entry(uint32_t id, struct tffs_entry *entry)
 
 	off_t pos = 0;
 	uint8_t block_end = 0;
-	for (uint32_t sector = 0; sector < sectors->num_sectors; sector++, pos += TFFS_SECTOR_SIZE) {
+	for (uint32_t sector = 0; sector < num_sectors; sector++, pos += TFFS_SECTOR_SIZE) {
 		if (block_end) {
 			if (pos % blocksize == 0) {
 				block_end = 0;
 			}
 		} else if (sector_get_good(sector)) {
+			if (sector_ids[sector]) {
+				if (sector_ids[sector] == TFFS_ID_END) {
+					/* no more entries in this block */
+					block_end = 1;
+					continue;
+				}
+
+				if (sector_ids[sector] != id)
+					continue;
+			}
+
 			if (read_sectoroob(pos) || read_sector(pos)) {
 				fprintf(stderr, "ERROR: sector isn't readable, but has been previously!\n");
 				exit(EXIT_FAILURE);
 			}
-			uint32_t oob_id = read_uint32(oobbuf, 0x02);
-			uint32_t oob_len = read_uint32(oobbuf, 0x06);
-			uint32_t oob_rev = read_uint32(oobbuf, 0x0a);
 			uint32_t read_id = read_uint32(readbuf, 0x00);
 			uint32_t read_len = read_uint32(readbuf, 0x04);
 			uint32_t read_rev = read_uint32(readbuf, 0x0c);
-			if (read_oob_sector_health && (oob_id != read_id || oob_len != read_len || oob_rev != read_rev)) {
-				fprintf(stderr, "Warning: sector has inconsistent metadata\n");
-				continue;
+			if (read_oob_sector_health) {
+				uint32_t oob_id = read_uint32(oobbuf, 0x02);
+				uint32_t oob_len = read_uint32(oobbuf, 0x06);
+				uint32_t oob_rev = read_uint32(oobbuf, 0x0a);
+
+				if (oob_id != read_id || oob_len != read_len || oob_rev != read_rev) {
+					fprintf(stderr, "Warning: sector has inconsistent metadata\n");
+					continue;
+				}
 			}
 			if (read_id == TFFS_ID_END) {
 				/* no more entries in this block */
@@ -414,13 +427,14 @@ static int scan_mtd(void)
 
 	blocksize = info.erasesize;
 
-	sectors = malloc(sizeof(*sectors) + (info.size / TFFS_SECTOR_SIZE + 7) / 8);
-	if (sectors == NULL) {
+	num_sectors = info.size / TFFS_SECTOR_SIZE;
+	sectors = malloc((num_sectors + 7) / 8);
+	sector_ids = calloc(num_sectors, sizeof(uint32_t));
+	if (!sectors || !sector_ids) {
 		fprintf(stderr, "ERROR: memory allocation failed!\n");
 		exit(EXIT_FAILURE);
 	}
-	sectors->num_sectors = info.size / TFFS_SECTOR_SIZE;
-	memset(sectors->sectors, 0xff, (info.size / TFFS_SECTOR_SIZE + 7) / 8);
+	memset(sectors, 0xff, (num_sectors + 7) / 8);
 
 	uint32_t sector = 0, valid_blocks = 0;
 	uint8_t block_ok = 0;
@@ -564,6 +578,7 @@ int main(int argc, char *argv[])
 out_free_entry:
 	free(name_table.val);
 out_free_sectors:
+	free(sector_ids);
 	free(sectors);
 out_close:
 	close(mtdfd);

target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch

@@ -214,7 +214,7 @@
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
-@@ -864,10 +865,10 @@ static void tcp_v6_send_response(const s
+@@ -866,10 +867,10 @@ static void tcp_v6_send_response(const s
  	topt = (__be32 *)(t1 + 1);
 
  	if (tsecr) {

target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch

@@ -291,7 +291,7 @@ bcm2835-mmc: uninitialized_var is no more
  		goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1807,7 +1807,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1812,7 +1812,8 @@ EXPORT_SYMBOL(mmc_erase);
 
  int mmc_can_erase(struct mmc_card *card)
  {
@@ -1984,7 +1984,7 @@ bcm2835-mmc: uninitialized_var is no more
 
  #define MAX_TUNING_LOOP 40
 
-@@ -3143,7 +3143,7 @@ static void sdhci_timeout_timer(struct t
+@@ -3188,7 +3188,7 @@ static void sdhci_timeout_timer(struct t
  	spin_lock_irqsave(&host->lock, flags);
 
  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@@ -1993,7 +1993,7 @@ bcm2835-mmc: uninitialized_var is no more
  		       mmc_hostname(host->mmc));
  		sdhci_dumpregs(host);
 
-@@ -3165,7 +3165,7 @@ static void sdhci_timeout_data_timer(str
+@@ -3210,7 +3210,7 @@ static void sdhci_timeout_data_timer(str
 
  	if (host->data || host->data_cmd ||
  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) {

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int irq;
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5000,7 +5000,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5008,7 +5008,7 @@ int stmmac_dvr_probe(struct device *devi
  	priv->wol_irq = res->wol_irq;
  	priv->lpi_irq = res->lpi_irq;
 

target/linux/generic/backport-5.15/020-v6.1-03-mm-vmscan.c-refactor-shrink_node.patch

@@ -15,7 +15,7 @@ Change-Id: Iae734b5b4030205b7db6e8c841f747b6f6ae1a04
 
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
-@@ -2562,6 +2562,103 @@ enum scan_balance {
+@@ -2497,6 +2497,103 @@ enum scan_balance {
  	SCAN_FILE,
  };
 
@@ -119,15 +119,15 @@ Change-Id: Iae734b5b4030205b7db6e8c841f747b6f6ae1a04
  /*
   * Determine how aggressively the anon and file LRU lists should be
   * scanned.  The relative value of each set of LRU lists is determined
-@@ -3030,7 +3127,6 @@ static void shrink_node(pg_data_t *pgdat
+@@ -2965,7 +3062,6 @@ static void shrink_node(pg_data_t *pgdat
  	unsigned long nr_reclaimed, nr_scanned;
  	struct lruvec *target_lruvec;
  	bool reclaimable = false;
 -	unsigned long file;
 
  	target_lruvec = mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat);
 
-@@ -3046,93 +3142,7 @@ again:
+@@ -2981,93 +3077,7 @@ again:
  	nr_reclaimed = sc->nr_reclaimed;
  	nr_scanned = sc->nr_scanned;
 

target/linux/generic/backport-5.15/020-v6.1-04-mm-multigenerational-lru-groundwork.patch

@@ -720,7 +720,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
 
  #include <asm/tlbflush.h>
  #include <asm/div64.h>
-@@ -2880,6 +2881,273 @@ static bool can_age_anon_pages(struct pg
+@@ -2815,6 +2816,273 @@ static bool can_age_anon_pages(struct pg
  	return can_demote(pgdat->node_id, sc);
  }
 

target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch

@@ -387,7 +387,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
  	.dfl_cftypes = memory_files,
 --- a/mm/vmscan.c
 +++ b/mm/vmscan.c
-@@ -2929,6 +2929,306 @@ static bool __maybe_unused seq_is_valid(
+@@ -2864,6 +2864,306 @@ static bool __maybe_unused seq_is_valid(
  }
 
  /******************************************************************************
@@ -694,15 +694,15 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
   *                          state change
   ******************************************************************************/
 
-@@ -3112,6 +3412,7 @@ void lru_gen_init_state(struct mem_cgrou
+@@ -3047,6 +3347,7 @@ void lru_gen_init_state(struct mem_cgrou
  	int i;
  	int gen, type, zone;
  	struct lrugen *lrugen = &lruvec->evictable;
 +	struct lru_gen_mm_list *mm_list = get_mm_list(memcg);
 
  	lrugen->max_seq = MIN_NR_GENS + 1;
  	lrugen->enabled[0] = lru_gen_enabled() && lru_gen_nr_swapfiles;
-@@ -3122,6 +3423,17 @@ void lru_gen_init_state(struct mem_cgrou
+@@ -3057,6 +3358,17 @@ void lru_gen_init_state(struct mem_cgrou
 
  	for_each_gen_type_zone(gen, type, zone)
  		INIT_LIST_HEAD(&lrugen->lists[gen][type][zone]);
@@ -720,7 +720,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
  }
 
  #ifdef CONFIG_MEMCG
-@@ -3129,18 +3441,37 @@ void lru_gen_init_memcg(struct mem_cgrou
+@@ -3064,18 +3376,37 @@ void lru_gen_init_memcg(struct mem_cgrou
  {
  	int nid;
 

target/linux/generic/backport-5.15/020-v6.1-06-mm-multigenerational-lru-aging.patch

@@ -193,7 +193,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
 
  #include <asm/tlbflush.h>
  #include <asm/div64.h>
-@@ -2887,6 +2889,15 @@ static bool can_age_anon_pages(struct pg
+@@ -2822,6 +2824,15 @@ static bool can_age_anon_pages(struct pg
   *                          shorthand helpers
   ******************************************************************************/
 
@@ -209,7 +209,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
  #define for_each_gen_type_zone(gen, type, zone)				\
  	for ((gen) = 0; (gen) < MAX_NR_GENS; (gen)++)			\
  		for ((type) = 0; (type) < ANON_AND_FILE; (type)++)	\
-@@ -2899,6 +2910,12 @@ static int page_lru_gen(struct page *pag
+@@ -2834,6 +2845,12 @@ static int page_lru_gen(struct page *pag
  	return ((flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1;
  }
 
@@ -222,7 +222,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
  static struct lruvec *get_lruvec(int nid, struct mem_cgroup *memcg)
  {
  	struct pglist_data *pgdat = NODE_DATA(nid);
-@@ -3229,6 +3246,926 @@ done:
+@@ -3164,6 +3181,926 @@ done:
  }
 
  /******************************************************************************
@@ -1149,7 +1149,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
   *                          state change
   ******************************************************************************/
 
-@@ -3477,6 +4414,12 @@ static int __init init_lru_gen(void)
+@@ -3412,6 +4349,12 @@ static int __init init_lru_gen(void)
  };
  late_initcall(init_lru_gen);
 
@@ -1162,7 +1162,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
  #endif /* CONFIG_LRU_GEN */
 
  static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
-@@ -4331,6 +5274,11 @@ static void age_active_anon(struct pglis
+@@ -4266,6 +5209,11 @@ static void age_active_anon(struct pglis
  	struct mem_cgroup *memcg;
  	struct lruvec *lruvec;
 

target/linux/generic/backport-5.15/020-v6.1-07-mm-multigenerational-lru-eviction.patch

@@ -212,7 +212,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  		may_enter_fs = (sc->gfp_mask & __GFP_FS) ||
  			(PageSwapCache(page) && (sc->gfp_mask & __GFP_IO));
 
-@@ -2570,6 +2577,9 @@ static void prepare_scan_count(pg_data_t
+@@ -2505,6 +2512,9 @@ static void prepare_scan_count(pg_data_t
  	unsigned long file;
  	struct lruvec *target_lruvec;
 
@@ -222,7 +222,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  	target_lruvec = mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat);
 
  	/*
-@@ -2910,6 +2920,17 @@ static int page_lru_gen(struct page *pag
+@@ -2845,6 +2855,17 @@ static int page_lru_gen(struct page *pag
  	return ((flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1;
  }
 
@@ -240,7 +240,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  static int get_swappiness(struct mem_cgroup *memcg)
  {
  	return mem_cgroup_get_nr_swap_pages(memcg) >= MIN_BATCH_SIZE ?
-@@ -3246,6 +3267,91 @@ done:
+@@ -3181,6 +3202,91 @@ done:
  }
 
  /******************************************************************************
@@ -332,31 +332,31 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
   *                          the aging
   ******************************************************************************/
 
-@@ -3265,6 +3371,7 @@ static int page_update_gen(struct page *
+@@ -3200,6 +3306,7 @@ static int page_update_gen(struct page *
 
  		new_flags &= ~LRU_GEN_MASK;
  		new_flags |= (gen + 1UL) << LRU_GEN_PGOFF;
 +		new_flags &= ~(LRU_REFS_MASK | LRU_REFS_FLAGS);
  	} while (new_flags != old_flags &&
  		 cmpxchg(&page->flags, old_flags, new_flags) != old_flags);
 
-@@ -3296,6 +3403,7 @@ static void page_inc_gen(struct page *pa
+@@ -3231,6 +3338,7 @@ static void page_inc_gen(struct page *pa
 
  		new_flags &= ~LRU_GEN_MASK;
  		new_flags |= (new_gen + 1UL) << LRU_GEN_PGOFF;
 +		new_flags &= ~(LRU_REFS_MASK | LRU_REFS_FLAGS);
  		/* for end_page_writeback() */
  		if (reclaiming)
  			new_flags |= BIT(PG_reclaim);
-@@ -3787,6 +3895,7 @@ static bool inc_min_seq(struct lruvec *l
+@@ -3722,6 +3830,7 @@ static bool inc_min_seq(struct lruvec *l
  		}
  	}
 
 +	reset_ctrl_pos(lruvec, gen, type);
  	WRITE_ONCE(lrugen->min_seq[type], lrugen->min_seq[type] + 1);
 
  	return true;
-@@ -3824,6 +3933,8 @@ next:
+@@ -3759,6 +3868,8 @@ next:
  		if (min_seq[type] == lrugen->min_seq[type])
  			continue;
 
@@ -365,7 +365,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  		WRITE_ONCE(lrugen->min_seq[type], min_seq[type]);
  		success = true;
  	}
-@@ -3885,6 +3996,9 @@ static void inc_max_seq(struct lruvec *l
+@@ -3820,6 +3931,9 @@ static void inc_max_seq(struct lruvec *l
  		}
  	}
 
@@ -375,7 +375,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  	WRITE_ONCE(lrugen->timestamps[gen], jiffies);
  	/* make sure all preceding modifications appear first */
  	smp_store_release(&lrugen->max_seq, lrugen->max_seq + 1);
-@@ -4166,6 +4280,433 @@ void lru_gen_look_around(struct page_vma
+@@ -4101,6 +4215,433 @@ void lru_gen_look_around(struct page_vma
  }
 
  /******************************************************************************
@@ -809,7 +809,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
   *                          state change
   ******************************************************************************/
 
-@@ -4420,6 +4961,10 @@ static void lru_gen_age_node(struct pgli
+@@ -4355,6 +4896,10 @@ static void lru_gen_age_node(struct pgli
  {
  }
 
@@ -820,7 +820,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  #endif /* CONFIG_LRU_GEN */
 
  static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
-@@ -4433,6 +4978,11 @@ static void shrink_lruvec(struct lruvec
+@@ -4368,6 +4913,11 @@ static void shrink_lruvec(struct lruvec
  	bool proportional_reclaim;
  	struct blk_plug plug;
 
@@ -832,7 +832,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  	get_scan_count(lruvec, sc, nr);
 
  	/* Record the original scan target for proportional adjustments later */
-@@ -4904,6 +5454,9 @@ static void snapshot_refaults(struct mem
+@@ -4839,6 +5389,9 @@ static void snapshot_refaults(struct mem
  	struct lruvec *target_lruvec;
  	unsigned long refaults;