Skip to content

Commit 3e6cac5

Browse files
authored
Merge branch 'master' into release/v5.5
2 parents f6de37c + d7f03cf commit 3e6cac5

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Diff for: configs/defconfig.common

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
7878
CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
7979
CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
8080
CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
81-
CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
8281
CONFIG_LWIP_MULTICAST_PING=y
8382
CONFIG_LWIP_BROADCAST_PING=y
8483
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8

Diff for: main/idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
rules:
1818
- if: "target in [esp32s3]"
1919
espressif/esp_matter:
20-
version: "^1.3.0"
20+
version: "^1.4.0"
2121
require: public
2222
rules:
2323
- if: "target not in [esp32c2, esp32h2, esp32p4]"

0 commit comments

Comments
 (0)