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

* https://github.com/coolsnowwolf/lede:
  ipq807x: fix kernel 5.15 cpufreq support
  kernel: Drop mark apcs_alias0_core_clk as critical (coolsnowwolf#10349)
  feed: add a new feed for oui (coolsnowwolf#10347)
  Version update to R22.11.11
  kernel: bump 5.10 to 5.10.152 (coolsnowwolf#10341)
  kernel: bump 5.4 to 5.4.221 (coolsnowwolf#10342)

Author: github-actions[bot]

feeds.conf.default

@@ -2,6 +2,7 @@ src-git packages https://github.com/coolsnowwolf/packages
 src-git luci https://github.com/coolsnowwolf/luci
 src-git routing https://github.com/coolsnowwolf/routing
 src-git telephony https://git.openwrt.org/feed/telephony.git
+src-git oui https://github.com/zhaojh329/oui.git
 #src-git video https://github.com/openwrt/video.git
 #src-git targets https://github.com/openwrt/targets.git
 #src-git oldpackages http://git.openwrt.org/packages.git

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .150
-LINUX_KERNEL_HASH-5.10.150 = 5813bc3c5d70b0beb26de4b627baa33554d01bed8c842a2e46072cf03d74dee1
+LINUX_VERSION-5.10 = .152
+LINUX_KERNEL_HASH-5.10.152 = fa0b5c83a4ebfda9f0a52cc693646eb6c24dbade6c37ee2d18b66ee2df15d8a6

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .219
-LINUX_KERNEL_HASH-5.4.219 = 5293ad927269dfb697bc80e9dd95c1d9fd2e4bad7d8422300e012fd31950a261
+LINUX_VERSION-5.4 = .221
+LINUX_KERNEL_HASH-5.4.221 = 27b37fc1fed7b4dcddf5a0a3730fabf25197c0ba13ace684481aa5444649df0a

package/firmware/ipq-wifi/Makefile

@@ -57,6 +57,9 @@ ALLWIFIBOARDS:= \
 	p2w_r619ac \
 	qnap_301w \
 	qxwlan_e2600ac \
+	redmi_ax6 \
+	xiaomi_ax3600 \
+	xiaomi_ax9000 \
 	zte_mf263 \
 	zte_mf269 \
 	tplink_xtr10890
@@ -161,6 +164,9 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
 $(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC))
 $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
+$(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
+$(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
+$(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
 $(eval $(call generate-ipq-wifi-package,zte_mf263,ZTE MF263))
 $(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269))
 $(eval $(call generate-ipq-wifi-package,tplink_xtr10890,TPLINK XTR10890))

package/firmware/ipq-wifi/board-redmi_ax6.ipq8074

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=2
-PKG_RELEASE:=31
+PKG_RELEASE:=32
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

package/firmware/ipq-wifi/board-xiaomi_ax3600.ipq8074

@@ -46,7 +46,7 @@ sed -i '/option disabled/d' /etc/config/wireless
 sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 
 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R22.10.20'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R22.11.11'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
 

package/firmware/ipq-wifi/board-xiaomi_ax3600.qca9889

@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -254,7 +254,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
+@@ -255,7 +255,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
 
  # args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
  quiet_cmd_wrap	= WRAP    $@

package/firmware/ipq-wifi/board-xiaomi_ax9000.ipq8074

@@ -7,7 +7,7 @@
 +obj-$(CONFIG_MTD_PARSER_CYBERTAN)	+= parser_cybertan.o
  obj-$(CONFIG_MTD_PARSER_IMAGETAG)	+= parser_imagetag.o
  obj-$(CONFIG_MTD_AFS_PARTS)		+= afs.o
- obj-$(CONFIG_MTD_PARSER_TPLINK_SAFELOADER)	+= tplink_safeloader.o
+ obj-$(CONFIG_MTD_PARSER_TRX)		+= parser_trx.o
 --- a/drivers/mtd/parsers/Kconfig
 +++ b/drivers/mtd/parsers/Kconfig
 @@ -102,6 +102,14 @@ config MTD_OF_PARTS_LINKSYS_NS

package/lean/default-settings/Makefile

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -507,7 +507,7 @@ KBUILD_LDFLAGS_MODULE :=
+@@ -509,7 +509,7 @@ KBUILD_LDFLAGS_MODULE :=
  KBUILD_LDFLAGS :=
  CLANG_FLAGS :=
 

package/lean/default-settings/files/zzz-default-settings

@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <[email protected]>
  			if (b->sparse_flow_count + b->bulk_flow_count)
  				empty = false;
 
-@@ -2269,8 +2268,7 @@ static int cake_config_besteffort(struct
+@@ -2273,8 +2272,7 @@ static int cake_config_besteffort(struct
 
  	cake_set_rate(b, rate, mtu,
  		      us_to_ns(q->target), us_to_ns(q->interval));
@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	return 0;
  }
-@@ -2281,8 +2279,7 @@ static int cake_config_precedence(struct
+@@ -2285,8 +2283,7 @@ static int cake_config_precedence(struct
  	struct cake_sched_data *q = qdisc_priv(sch);
  	u32 mtu = psched_mtu(qdisc_dev(sch));
  	u64 rate = q->rate_bps;
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	u32 i;
 
  	q->tin_cnt = 8;
-@@ -2295,18 +2292,14 @@ static int cake_config_precedence(struct
+@@ -2299,18 +2296,14 @@ static int cake_config_precedence(struct
  		cake_set_rate(b, rate, mtu, us_to_ns(q->target),
  			      us_to_ns(q->interval));
 
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	}
 
  	return 0;
-@@ -2375,8 +2368,7 @@ static int cake_config_diffserv8(struct
+@@ -2379,8 +2372,7 @@ static int cake_config_diffserv8(struct
  	struct cake_sched_data *q = qdisc_priv(sch);
  	u32 mtu = psched_mtu(qdisc_dev(sch));
  	u64 rate = q->rate_bps;
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	u32 i;
 
  	q->tin_cnt = 8;
-@@ -2392,18 +2384,14 @@ static int cake_config_diffserv8(struct
+@@ -2396,18 +2388,14 @@ static int cake_config_diffserv8(struct
  		cake_set_rate(b, rate, mtu, us_to_ns(q->target),
  			      us_to_ns(q->interval));
 
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	}
 
  	return 0;
-@@ -2442,17 +2430,11 @@ static int cake_config_diffserv4(struct
+@@ -2446,17 +2434,11 @@ static int cake_config_diffserv4(struct
  	cake_set_rate(&q->tins[3], rate >> 2, mtu,
  		      us_to_ns(q->target), us_to_ns(q->interval));
 
@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	return 0;
  }
-@@ -2483,15 +2465,10 @@ static int cake_config_diffserv3(struct
+@@ -2487,15 +2469,10 @@ static int cake_config_diffserv3(struct
  	cake_set_rate(&q->tins[2], rate >> 2, mtu,
  		      us_to_ns(q->target), us_to_ns(q->interval));
 

target/linux/apm821xx/patches-5.4/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch

@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -469,7 +469,11 @@ static int fq_codel_init(struct Qdisc *s
+@@ -467,7 +467,11 @@ static int fq_codel_init(struct Qdisc *s
 
  	sch->limit = 10*1024;
  	q->flows_cnt = 1024;

target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch

@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	  device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2290,7 +2290,7 @@ static int __init pktsched_init(void)
+@@ -2291,7 +2291,7 @@ static int __init pktsched_init(void)
  		return err;
  	}
 
@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	register_qdisc(&pfifo_head_drop_qdisc_ops);
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -709,7 +709,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -707,7 +707,7 @@ static const struct Qdisc_class_ops fq_c
  	.walk		=	fq_codel_walk,
  };
 
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	.cl_ops		=	&fq_codel_class_ops,
  	.id		=	"fq_codel",
  	.priv_size	=	sizeof(struct fq_codel_sched_data),
-@@ -724,6 +724,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -722,6 +722,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
  	.dump_stats =	fq_codel_dump_stats,
  	.owner		=	THIS_MODULE,
  };

target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch

@@ -12,8 +12,8 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -860,6 +860,10 @@ struct sk_buff {
- #endif
+@@ -862,6 +862,10 @@ struct sk_buff {
+ 	__u8			scm_io_uring:1;
  	__u8			gro_skip:1;
 
 +#ifdef CONFIG_SHORTCUT_FE

target/linux/generic/backport-5.4/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch

@@ -30,7 +30,7 @@
  	ret = read_sr(nor);
  	if (ret < 0) {
  		dev_err(nor->dev, "error while reading status register\n");
-@@ -2337,7 +2344,7 @@ static const struct flash_info spi_nor_i
+@@ -2338,7 +2345,7 @@ static const struct flash_info spi_nor_i
  	{ "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
  	{ "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
  	{ "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
@@ -39,7 +39,7 @@
  	{ "mx25u2033e",  INFO(0xc22532, 0, 64 * 1024,   4, SECT_4K) },
  	{ "mx25u3235f",	 INFO(0xc22536, 0, 64 * 1024,  64,
  			 SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-@@ -5025,6 +5032,9 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -5026,6 +5033,9 @@ int spi_nor_scan(struct spi_nor *nor, co
  	if (info->flags & USE_CLSR)
  		nor->flags |= SNOR_F_USE_CLSR;
 

target/linux/generic/hack-5.10/660-fq_codel_defaults.patch

@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2692,6 +2692,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2694,6 +2694,10 @@ static inline int pskb_trim(struct sk_bu
  	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
 
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  /**
   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *	@skb: buffer to alter
-@@ -2823,16 +2827,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2825,16 +2829,6 @@ static inline struct sk_buff *dev_alloc_
  }
 
 

target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch

@@ -12,9 +12,9 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -826,6 +826,10 @@ struct sk_buff {
+@@ -827,6 +827,10 @@ struct sk_buff {
  #endif
- 	__u8			gro_skip:1;
+ 	__u8			scm_io_uring:1;
 
 +#ifdef CONFIG_SHORTCUT_FE
 +	__u8			fast_forwarded:1;

target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -744,11 +744,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
+@@ -747,11 +747,11 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
  KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 
  ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE

target/linux/generic/hack-5.4/400-unlock_mx25l6406e_with_4bit_block_protect.patch

@@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2506,6 +2506,9 @@ static const struct flash_info spi_nor_i
+@@ -2507,6 +2507,9 @@ static const struct flash_info spi_nor_i
  	/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
  	{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  	{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

target/linux/generic/hack-5.4/721-phy_packets.patch

@@ -91,7 +91,7 @@ Signed-off-by: Chuanhong Guo <[email protected]>
 
  	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
  	return ret;
-@@ -2559,6 +2586,10 @@ static int spi_nor_read(struct mtd_info
+@@ -2560,6 +2587,10 @@ static int spi_nor_read(struct mtd_info
  	if (ret)
  		return ret;
 
@@ -102,15 +102,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
  	while (len) {
  		loff_t addr = from;
 
-@@ -2582,6 +2613,7 @@ static int spi_nor_read(struct mtd_info
+@@ -2583,6 +2614,7 @@ static int spi_nor_read(struct mtd_info
  	ret = 0;
 
  read_err:
 +	spi_nor_check_set_addr_width(nor, 0);
  	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
  	return ret;
  }
-@@ -2599,6 +2631,10 @@ static int sst_write(struct mtd_info *mt
+@@ -2600,6 +2632,10 @@ static int sst_write(struct mtd_info *mt
  	if (ret)
  		return ret;
 
@@ -121,15 +121,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
  	write_enable(nor);
 
  	nor->sst_write_second = false;
-@@ -2661,6 +2697,7 @@ static int sst_write(struct mtd_info *mt
+@@ -2662,6 +2698,7 @@ static int sst_write(struct mtd_info *mt
  	}
  sst_write_err:
  	*retlen += actual;
 +	spi_nor_check_set_addr_width(nor, 0);
  	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
  	return ret;
  }
-@@ -2683,6 +2720,10 @@ static int spi_nor_write(struct mtd_info
+@@ -2684,6 +2721,10 @@ static int spi_nor_write(struct mtd_info
  	if (ret)
  		return ret;
 
@@ -140,15 +140,15 @@ Signed-off-by: Chuanhong Guo <[email protected]>
  	for (i = 0; i < len; ) {
  		ssize_t written;
  		loff_t addr = to + i;
-@@ -2722,6 +2763,7 @@ static int spi_nor_write(struct mtd_info
+@@ -2723,6 +2764,7 @@ static int spi_nor_write(struct mtd_info
  	}
 
  write_err:
 +	spi_nor_check_set_addr_width(nor, 0);
  	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
  	return ret;
  }
-@@ -4726,9 +4768,13 @@ static int spi_nor_init(struct spi_nor *
+@@ -4727,9 +4769,13 @@ static int spi_nor_init(struct spi_nor *
  		 * reboots (e.g., crashes). Warn the user (or hopefully, system
  		 * designer) that this is bad.
  		 */

target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -10,7 +10,7 @@ Signed-off-by: Koen Vandeputte <[email protected]>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2232,6 +2232,11 @@ static const struct flash_info spi_nor_i
+@@ -2233,6 +2233,11 @@ static const struct flash_info spi_nor_i
 
  	/* GigaDevice */
  	{

target/linux/generic/pending-5.10/201-extra_optimization.patch

@@ -48,7 +48,7 @@ Signed-off-by: Mantas Pucka <[email protected]>
  /* NOTE: double check command sets and memory organization when you add
   * more nor chips.  This current list focusses on newer chips, which
   * have been converging on command sets which including JEDEC ID.
-@@ -2515,7 +2541,8 @@ static const struct flash_info spi_nor_i
+@@ -2516,7 +2542,8 @@ static const struct flash_info spi_nor_i
  	{ "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
  	{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024,  16, SECT_4K) },
  	{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },

target/linux/generic/pending-5.4/479-mtd-spi-nor-add-xtx-xt25f128b.patch

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2658,7 +2658,7 @@ static inline int pskb_network_may_pull(
+@@ -2660,7 +2660,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD

target/linux/generic/pending-5.4/481-mtd-spi-nor-rework-broken-flash-reset-support.patch

@@ -22,14 +22,14 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -824,6 +824,7 @@ struct sk_buff {
- #ifdef CONFIG_TLS_DEVICE
- 	__u8			decrypted:1;
+@@ -830,6 +830,7 @@ struct sk_buff {
+ #ifdef CONFIG_NET_SCHED
+ 	__u16			tc_index;	/* traffic control index */
  #endif
 +	__u8			gro_skip:1;
 
- #ifdef CONFIG_NET_SCHED
- 	__u16			tc_index;	/* traffic control index */
+ 	union {
+ 		__wsum		csum;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
 @@ -5502,6 +5502,9 @@ static enum gro_result dev_gro_receive(s

target/linux/generic/pending-5.4/482-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch

@@ -18,7 +18,7 @@ Signed-off-by: Tudor Ambarus <[email protected]>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2353,6 +2353,8 @@ static const struct flash_info spi_nor_i
+@@ -2354,6 +2354,8 @@ static const struct flash_info spi_nor_i
  	{ "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
  	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
  	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },

target/linux/generic/pending-5.4/482-mtd-spi-nor-fix-4-byte-opcode-support-for-w25q256.patch

@@ -1,7 +1,7 @@
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2242,6 +2242,8 @@ static const struct flash_info spi_nor_i
- 	{ "en25q128",   INFO(0x1c3018, 0, 64 * 1024,  256, SECT_4K) },
+@@ -2243,6 +2243,8 @@ static const struct flash_info spi_nor_i
+ 	{ "en25qx128a",	INFO(0x1c7118, 0, 64 * 1024,  256, SECT_4K) },
  	{ "en25q80a",   INFO(0x1c3014, 0, 64 * 1024,   16,
  			SECT_4K | SPI_NOR_DUAL_READ) },
 +	{ "en25qh16",   INFO(0x1c7015, 0, 64 * 1024,   32,

target/linux/generic/pending-5.4/655-increase_skb_pad.patch

@@ -14,7 +14,7 @@ Signed-off-by: Robert Marko <[email protected]>
 
 --- a/drivers/mmc/host/sdhci-msm.c
 +++ b/drivers/mmc/host/sdhci-msm.c
-@@ -1763,7 +1763,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
+@@ -1764,7 +1764,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat
 
  static const struct sdhci_ops sdhci_msm_ops = {
  	.reset = sdhci_reset,