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

* https://github.com/coolsnowwolf/lede:
  kernel: bump 6.1 to 6.1.68 (coolsnowwolf#11708)
  kernel: bump 5.4 to 5.4.264 (coolsnowwolf#11711)
  kernel: bump 5.10 to 5.10.201 (coolsnowwolf#11710)
  kernel: bump 5.15 to 5.15.142 (coolsnowwolf#11709)

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .199
-LINUX_KERNEL_HASH-5.10.199 = a0ea77a1f5eeb1387d62e7a8df585ffc53758e4da153d98224ccd833bd2624c1
+LINUX_VERSION-5.10 = .201
+LINUX_KERNEL_HASH-5.10.201 = 6afc06598fa8e3bc907cff75f995f372df51d40a284e260de78a3421b1f18218

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .138
-LINUX_KERNEL_HASH-5.15.138 = af84e54164e1c01f59764ba528448ed36b377d22aafbd81b4b0cf47792ef4aaa
+LINUX_VERSION-5.15 = .142
+LINUX_KERNEL_HASH-5.15.142 = 8d76c95277dc5ab0a6cd0069432af2ceb759d0ac2b6f5401330d390196095676

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .263
-LINUX_KERNEL_HASH-5.4.263 = 50d0db9a94118b2d45f2ea1ed7b094cfd39f32829e4a2b51473dd3a8257735f8
+LINUX_VERSION-5.4 = .264
+LINUX_KERNEL_HASH-5.4.264 = d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .66
-LINUX_KERNEL_HASH-6.1.66 = 419e62cd6c4239e6950b688db9e8753eb1e99c216dc3204f7932398a3fef1a0c
+LINUX_VERSION-6.1 = .68
+LINUX_KERNEL_HASH-6.1.68 = 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1

target/linux/armvirt/patches-5.15/701-dpaa2-eth-do-not-hold-rtnl_lock.patch

@@ -27,7 +27,7 @@ Signed-off-by: Russell King <[email protected]>
 
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
-@@ -4217,12 +4217,10 @@ static irqreturn_t dpni_irq0_handler_thr
+@@ -4215,12 +4215,10 @@ static irqreturn_t dpni_irq0_handler_thr
  		dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
  		dpaa2_eth_update_tx_fqids(priv);
 

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

@@ -740,7 +740,7 @@ SVN-Revision: 35130
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4134,14 +4134,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4147,14 +4147,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
 

target/linux/ath79/patches-5.4/0036-GPIO-add-named-gpio-exports.patch

@@ -93,7 +93,7 @@ Signed-off-by: John Crispin <[email protected]>
 +module_platform_driver(gpio_export_driver);
 --- a/drivers/gpio/gpiolib-sysfs.c
 +++ b/drivers/gpio/gpiolib-sysfs.c
-@@ -571,7 +571,7 @@ static struct class gpio_class = {
+@@ -574,7 +574,7 @@ static struct class gpio_class = {
   *
   * Returns zero on success, else an error.
   */
@@ -102,7 +102,7 @@ Signed-off-by: John Crispin <[email protected]>
  {
  	struct gpio_chip	*chip;
  	struct gpio_device	*gdev;
-@@ -633,6 +633,8 @@ int gpiod_export(struct gpio_desc *desc,
+@@ -636,6 +636,8 @@ int gpiod_export(struct gpio_desc *desc,
  	offset = gpio_chip_hwgpio(desc);
  	if (chip->names && chip->names[offset])
  		ioname = chip->names[offset];
@@ -111,7 +111,7 @@ Signed-off-by: John Crispin <[email protected]>
 
  	dev = device_create_with_groups(&gpio_class, &gdev->dev,
  					MKDEV(0, 0), data, gpio_groups,
-@@ -654,6 +656,12 @@ err_unlock:
+@@ -657,6 +659,12 @@ err_unlock:
  	gpiod_dbg(desc, "%s: status %d\n", __func__, status);
  	return status;
  }

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

@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4017,14 +4017,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4021,14 +4021,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
 

target/linux/generic/backport-5.10/782-v5.11-net-usb-r8153_ecm-support-ECM-mode-for-RTL8153.patch

@@ -98,7 +98,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  {
  	struct usb_device *udev = interface_to_usbdev(intf);
  	u32 ocp_data = 0;
-@@ -6662,12 +6639,13 @@ static u8 rtl_get_version(struct usb_int
+@@ -6689,12 +6666,13 @@ static u8 rtl_get_version(struct usb_int
 
  	return version;
  }

target/linux/generic/backport-5.10/783-v5.12-net-usb-r8152-use-new-tasklet-API.patch

@@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
  	if (test_bit(RTL8152_UNPLUG, &tp->flags))
  		return;
-@@ -6697,7 +6695,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -6724,7 +6722,7 @@ static int rtl8152_probe(struct usb_inte
  	mutex_init(&tp->control);
  	INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
  	INIT_DELAYED_WORK(&tp->hw_phy_work, rtl_hw_phy_work_func_t);

target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch

@@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  		break;
  	}
 
-@@ -6830,7 +6830,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -6857,7 +6857,7 @@ static int rtl8152_probe(struct usb_inte
 
  	ret = register_netdev(netdev);
  	if (ret != 0) {

target/linux/generic/backport-5.10/792-v5.13-r8152-add-help-function-to-change-mtu.patch

@@ -146,7 +146,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		tp->rx_buf_sz		= 32 * 1024;
  		tp->eee_en		= true;
  		tp->eee_adv		= MDIO_EEE_1000T | MDIO_EEE_100TX;
-@@ -6832,7 +6841,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -6859,7 +6868,7 @@ static int rtl8152_probe(struct usb_inte
  		netdev->max_mtu = ETH_DATA_LEN;
  		break;
  	default:

target/linux/generic/backport-5.10/793-v5.13-r8152-support-new-chips.patch

@@ -2756,7 +2756,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	default:
  		break;
  	}
-@@ -6724,6 +8744,27 @@ u8 rtl8152_get_version(struct usb_interf
+@@ -6751,6 +8771,27 @@ u8 rtl8152_get_version(struct usb_interf
  	case 0x6010:
  		version = RTL_VER_09;
  		break;
@@ -2784,7 +2784,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	default:
  		version = RTL_VER_UNKNOWN;
  		dev_info(&intf->dev, "Unknown version 0x%04x\n", ocp_data);
-@@ -6836,12 +8877,29 @@ static int rtl8152_probe(struct usb_inte
+@@ -6863,12 +8904,29 @@ static int rtl8152_probe(struct usb_inte
  	/* MTU range: 68 - 1500 or 9194 */
  	netdev->min_mtu = ETH_MIN_MTU;
  	switch (tp->version) {
@@ -2817,7 +2817,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		break;
  	}
 
-@@ -6857,7 +8915,13 @@ static int rtl8152_probe(struct usb_inte
+@@ -6884,7 +8942,13 @@ static int rtl8152_probe(struct usb_inte
  	tp->advertising = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL |
  			  RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL;
  	if (tp->mii.supports_gmii) {
@@ -2832,7 +2832,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		tp->advertising |= RTL_ADVERTISED_1000_FULL;
  	}
  	tp->duplex = DUPLEX_FULL;
-@@ -6881,7 +8945,11 @@ static int rtl8152_probe(struct usb_inte
+@@ -6908,7 +8972,11 @@ static int rtl8152_probe(struct usb_inte
  	set_ethernet_addr(tp);
 
  	usb_set_intfdata(intf, tp);
@@ -2845,7 +2845,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	ret = register_netdev(netdev);
  	if (ret != 0) {
-@@ -6917,7 +8985,8 @@ static void rtl8152_disconnect(struct us
+@@ -6948,7 +9016,8 @@ static void rtl8152_disconnect(struct us
  		unregister_netdev(tp->netdev);
  		tasklet_kill(&tp->tx_tl);
  		cancel_delayed_work_sync(&tp->hw_phy_work);
@@ -2855,7 +2855,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		rtl8152_release_firmware(tp);
  		free_netdev(tp->netdev);
  	}
-@@ -6937,13 +9006,28 @@ static void rtl8152_disconnect(struct us
+@@ -6968,13 +9037,28 @@ static void rtl8152_disconnect(struct us
  	.idProduct = (prod), \
  	.bInterfaceClass = USB_CLASS_COMM, \
  	.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \

target/linux/generic/backport-5.10/795-v5.13-r8152-search-the-configuration-of-vendor-mode.patch

@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int rtl8152_pre_reset(struct usb_interface *intf)
  {
  	struct r8152 *tp = usb_get_intfdata(intf);
-@@ -9348,10 +9381,8 @@ static int rtl8152_probe(struct usb_inte
+@@ -9375,10 +9408,8 @@ static int rtl8152_probe(struct usb_inte
  	if (version == RTL_VER_UNKNOWN)
  		return -ENODEV;
 

target/linux/generic/backport-5.15/020-v6.1-05-mm-multi-gen-LRU-groundwork.patch

@@ -594,15 +594,15 @@ Signed-off-by: Andrew Morton <[email protected]>
  	VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
 --- a/mm/memcontrol.c
 +++ b/mm/memcontrol.c
-@@ -5178,6 +5178,7 @@ static void __mem_cgroup_free(struct mem
+@@ -5179,6 +5179,7 @@ static void __mem_cgroup_free(struct mem
 
  static void mem_cgroup_free(struct mem_cgroup *memcg)
  {
 +	lru_gen_exit_memcg(memcg);
  	memcg_wb_domain_exit(memcg);
  	__mem_cgroup_free(memcg);
  }
-@@ -5241,6 +5242,7 @@ static struct mem_cgroup *mem_cgroup_all
+@@ -5242,6 +5243,7 @@ static struct mem_cgroup *mem_cgroup_all
  	memcg->deferred_split_queue.split_queue_len = 0;
  #endif
  	idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);

target/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch

@@ -414,7 +414,7 @@ Signed-off-by: Andrew Morton <[email protected]>
  	/* forking complete and child started to run, tell ptracer */
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -5010,6 +5010,7 @@ context_switch(struct rq *rq, struct tas
+@@ -5014,6 +5014,7 @@ context_switch(struct rq *rq, struct tas
  		 * finish_task_switch()'s mmdrop().
  		 */
  		switch_mm_irqs_off(prev->active_mm, next->mm, next);
@@ -424,7 +424,7 @@ Signed-off-by: Andrew Morton <[email protected]>
  			/* will mmdrop() in finish_task_switch(). */
 --- a/mm/memcontrol.c
 +++ b/mm/memcontrol.c
-@@ -6212,6 +6212,30 @@ static void mem_cgroup_move_task(void)
+@@ -6213,6 +6213,30 @@ static void mem_cgroup_move_task(void)
  }
  #endif
 
@@ -455,7 +455,7 @@ Signed-off-by: Andrew Morton <[email protected]>
  static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
  {
  	if (value == PAGE_COUNTER_MAX)
-@@ -6555,6 +6579,7 @@ struct cgroup_subsys memory_cgrp_subsys
+@@ -6556,6 +6580,7 @@ struct cgroup_subsys memory_cgrp_subsys
  	.css_reset = mem_cgroup_css_reset,
  	.css_rstat_flush = mem_cgroup_css_rstat_flush,
  	.can_attach = mem_cgroup_can_attach,

target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch

@@ -318,7 +318,7 @@ Signed-off-by: Andrew Morton <[email protected]>
  	mctz = soft_limit_tree_from_page(page);
  	if (!mctz)
  		return;
-@@ -3433,6 +3443,9 @@ unsigned long mem_cgroup_soft_limit_recl
+@@ -3434,6 +3444,9 @@ unsigned long mem_cgroup_soft_limit_recl
  	unsigned long excess;
  	unsigned long nr_scanned;
 
@@ -328,23 +328,23 @@ Signed-off-by: Andrew Morton <[email protected]>
  	if (order > 0)
  		return 0;
 
-@@ -5321,6 +5334,7 @@ static int mem_cgroup_css_online(struct
+@@ -5322,6 +5335,7 @@ static int mem_cgroup_css_online(struct
  	if (unlikely(mem_cgroup_is_root(memcg)))
  		queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
  				   2UL*HZ);
 +	lru_gen_online_memcg(memcg);
  	return 0;
  }
 
-@@ -5347,6 +5361,7 @@ static void mem_cgroup_css_offline(struc
+@@ -5348,6 +5362,7 @@ static void mem_cgroup_css_offline(struc
  	memcg_offline_kmem(memcg);
  	reparent_shrinker_deferred(memcg);
  	wb_memcg_offline(memcg);
 +	lru_gen_offline_memcg(memcg);
 
  	drain_all_stock(memcg);
 
-@@ -5358,6 +5373,7 @@ static void mem_cgroup_css_released(stru
+@@ -5359,6 +5374,7 @@ static void mem_cgroup_css_released(stru
  	struct mem_cgroup *memcg = mem_cgroup_from_css(css);
 
  	invalidate_reclaim_iterators(memcg);

target/linux/generic/backport-5.15/350-v5.18-regmap-add-configurable-downshift-for-addresses.patch

@@ -37,31 +37,31 @@ Signed-off-by: Mark Brown <[email protected]>
  	map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
  	map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
  			config->val_bits + config->pad_bits, 8);
-@@ -1735,6 +1736,7 @@ static int _regmap_raw_write_impl(struct
+@@ -1737,6 +1738,7 @@ static int _regmap_raw_write_impl(struct
  			return ret;
  	}
 
 +	reg >>= map->format.reg_downshift;
  	map->format.format_reg(map->work_buf, reg, map->reg_shift);
  	regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
  				      map->write_flag_mask);
-@@ -1905,6 +1907,7 @@ static int _regmap_bus_formatted_write(v
+@@ -1907,6 +1909,7 @@ static int _regmap_bus_formatted_write(v
  			return ret;
  	}
 
 +	reg >>= map->format.reg_downshift;
  	map->format.format_write(map, reg, val);
 
  	trace_regmap_hw_write_start(map, reg, 1);
-@@ -2346,6 +2349,7 @@ static int _regmap_raw_multi_reg_write(s
+@@ -2348,6 +2351,7 @@ static int _regmap_raw_multi_reg_write(s
  		unsigned int reg = regs[i].reg;
  		unsigned int val = regs[i].def;
  		trace_regmap_hw_write_start(map, reg, 1);
 +		reg >>= map->format.reg_downshift;
  		map->format.format_reg(u8, reg, map->reg_shift);
  		u8 += reg_bytes + pad_bytes;
  		map->format.format_val(u8, val, 0);
-@@ -2673,6 +2677,7 @@ static int _regmap_raw_read(struct regma
+@@ -2675,6 +2679,7 @@ static int _regmap_raw_read(struct regma
  			return ret;
  	}
 

target/linux/generic/backport-5.15/351-v5.18-regmap-allow-a-defined-reg_base-to-be-added-to-every.patch

@@ -42,31 +42,31 @@ Signed-off-by: Mark Brown <[email protected]>
  	map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
  	map->format.pad_bytes = config->pad_bits / 8;
  	map->format.reg_downshift = config->reg_downshift;
-@@ -1736,6 +1738,7 @@ static int _regmap_raw_write_impl(struct
+@@ -1738,6 +1740,7 @@ static int _regmap_raw_write_impl(struct
  			return ret;
  	}
 
 +	reg += map->reg_base;
  	reg >>= map->format.reg_downshift;
  	map->format.format_reg(map->work_buf, reg, map->reg_shift);
  	regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
-@@ -1907,6 +1910,7 @@ static int _regmap_bus_formatted_write(v
+@@ -1909,6 +1912,7 @@ static int _regmap_bus_formatted_write(v
  			return ret;
  	}
 
 +	reg += map->reg_base;
  	reg >>= map->format.reg_downshift;
  	map->format.format_write(map, reg, val);
 
-@@ -2349,6 +2353,7 @@ static int _regmap_raw_multi_reg_write(s
+@@ -2351,6 +2355,7 @@ static int _regmap_raw_multi_reg_write(s
  		unsigned int reg = regs[i].reg;
  		unsigned int val = regs[i].def;
  		trace_regmap_hw_write_start(map, reg, 1);
 +		reg += map->reg_base;
  		reg >>= map->format.reg_downshift;
  		map->format.format_reg(u8, reg, map->reg_shift);
  		u8 += reg_bytes + pad_bytes;
-@@ -2677,6 +2682,7 @@ static int _regmap_raw_read(struct regma
+@@ -2679,6 +2684,7 @@ static int _regmap_raw_read(struct regma
  			return ret;
  	}
 

target/linux/generic/backport-5.15/352-v6.3-regmap-apply-reg_base-and-reg_downshift-for-single-r.patch

@@ -28,7 +28,7 @@ Signed-off-by: Mark Brown <[email protected]>
 
 --- a/drivers/base/regmap/regmap.c
 +++ b/drivers/base/regmap/regmap.c
-@@ -1929,6 +1929,8 @@ static int _regmap_bus_reg_write(void *c
+@@ -1931,6 +1931,8 @@ static int _regmap_bus_reg_write(void *c
  {
  	struct regmap *map = context;
 
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <[email protected]>
  	return map->bus->reg_write(map->bus_context, reg, val);
  }
 
-@@ -2703,6 +2705,8 @@ static int _regmap_bus_reg_read(void *co
+@@ -2705,6 +2707,8 @@ static int _regmap_bus_reg_read(void *co
  {
  	struct regmap *map = context;
 
@@ -46,7 +46,7 @@ Signed-off-by: Mark Brown <[email protected]>
  	return map->bus->reg_read(map->bus_context, reg, val);
  }
 
-@@ -3078,6 +3082,8 @@ static int _regmap_update_bits(struct re
+@@ -3080,6 +3084,8 @@ static int _regmap_update_bits(struct re
  		*change = false;
 
  	if (regmap_volatile(map, reg) && map->reg_update_bits) {

target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch

@@ -554,7 +554,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static void xrs700x_mac_link_up(struct dsa_switch *ds, int port,
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
-@@ -369,9 +369,8 @@ static int xgbe_set_link_ksettings(struc
+@@ -374,9 +374,8 @@ static int xgbe_set_link_ksettings(struc
  		  __ETHTOOL_LINK_MODE_MASK_NBITS, cmd->link_modes.advertising,
  		  __ETHTOOL_LINK_MODE_MASK_NBITS, lks->link_modes.supported);
 
@@ -566,7 +566,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	if ((cmd->base.autoneg == AUTONEG_ENABLE) &&
  	    bitmap_empty(advertising, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
-@@ -384,8 +383,7 @@ static int xgbe_set_link_ksettings(struc
+@@ -389,8 +388,7 @@ static int xgbe_set_link_ksettings(struc
  	pdata->phy.autoneg = cmd->base.autoneg;
  	pdata->phy.speed = speed;
  	pdata->phy.duplex = cmd->base.duplex;

target/linux/generic/backport-5.15/703-08-v5.17-net-phylink-add-mac_select_pcs-method-to-phylink_mac.patch

@@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	pl = kzalloc(sizeof(*pl), GFP_KERNEL);
  	if (!pl)
  		return ERR_PTR(-ENOMEM);
-@@ -946,9 +987,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
+@@ -947,9 +988,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
   * @pl: a pointer to a &struct phylink returned from phylink_create()
   * @pcs: a pointer to the &struct phylink_pcs
   *
@@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <[email protected]>
   *
   * Please note that there are behavioural changes with the mac_config()
   * callback if a PCS is present (denoting a newer setup) so removing a PCS
-@@ -959,6 +1001,14 @@ void phylink_set_pcs(struct phylink *pl,
+@@ -960,6 +1002,14 @@ void phylink_set_pcs(struct phylink *pl,
  {
  	pl->pcs = pcs;
  	pl->pcs_ops = pcs->ops;

target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch

@@ -66,7 +66,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	    phy_interface_empty(config->supported_interfaces)) {
  		dev_err(config->dev,
  			"phylink: error: empty supported_interfaces but mac_select_pcs() method present\n");
-@@ -1220,6 +1227,7 @@ struct phylink *phylink_create(struct ph
+@@ -1221,6 +1228,7 @@ struct phylink *phylink_create(struct ph
  		return ERR_PTR(-EINVAL);
  	}