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

* https://github.com/coolsnowwolf/lede:
  kernel: bump 6.0 to 6.0.12 (coolsnowwolf#10567)
  ath11k-wifi: add Edgecore EAP102 bdf support

Author: github-actions[bot]

include/kernel-6.0

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.0 = .11
-LINUX_KERNEL_HASH-6.0.11 = 2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762
+LINUX_VERSION-6.0 = .12
+LINUX_KERNEL_HASH-6.0.12 = 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01

package/firmware/ath11k-wifi/Makefile

@@ -25,6 +25,7 @@ endef
 # <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
 
 ALLWIFIBOARDS:= \
+  edgecore-eap102 \
 	gl-ax1800 \
 	gl-axt1800 \
 	qihoo_v6
@@ -84,6 +85,7 @@ endef
 # Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
 # Add $(eval $(call generate-ath11k-wifi-package,<devicename>,<display name>))
 
+$(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
 $(eval $(call generate-ath11k-wifi-package,gl-ax1800,Gl.iNET AX1800))
 $(eval $(call generate-ath11k-wifi-package,gl-axt1800,Gl.iNET AXT1800))
 $(eval $(call generate-ath11k-wifi-package,qihoo_v6,QIHOO 360V6))

package/firmware/ath11k-wifi/board-edgecore-eap102.bin.IPQ8074

@@ -87,15 +87,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
 
-@@ -3372,6 +3374,7 @@ static int packet_create(struct net *net
+@@ -3371,6 +3373,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
 +	po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
 
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -4011,6 +4014,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -4009,6 +4012,16 @@ packet_setsockopt(struct socket *sock, i
  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -4067,6 +4080,13 @@ static int packet_getsockopt(struct sock
+@@ -4065,6 +4078,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR:
  		val = po->has_vnet_hdr;
  		break;

target/linux/generic/pending-6.0/630-packet_socket_type.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1746,6 +1746,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1748,6 +1748,9 @@ void phy_detach(struct phy_device *phyde
  	struct module *ndev_owner = NULL;
  	struct mii_bus *bus;