Merge branch 'master' into pr/av-analysis-core-logic

Author: sayondeep

.github/.wordlist.txt

@@ -1496,6 +1496,7 @@ subtypes
 sudo
 SulfateConcentrationMeasurement
 SulfurDioxideConcentrationMeasurement
+superset
 suppressResponse
 svg
 SVR

.github/workflows/issue-labeler.yaml

@@ -11,7 +11,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v3.4 #May not be the latest version
+    - uses: github/issue-labeler@v3.5 #May not be the latest version
       with:
         configuration-path: .github/issue-labeler.yml
         not-before: 2020-01-15T02:54:34Z

.github/workflows/restyled.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - uses: restyled-io/actions/setup@67eaade33e75b529818c2e07c506ad29c2c1d776 # v4
+      - uses: restyled-io/actions/setup@8467a405c8fafe4dff2f3c341e37b56bd1703c89 # v4
 
       - id: restyler
-        uses: restyled-io/actions/run@67eaade33e75b529818c2e07c506ad29c2c1d776 # v4
+        uses: restyled-io/actions/run@8467a405c8fafe4dff2f3c341e37b56bd1703c89 # v4
 
       - name: Save restyle patch
         if: ${{ steps.restyler.outputs.git-patch }}

.gitmodules

@@ -22,7 +22,7 @@
 	platforms = esp32
 [submodule "pigweed"]
 	path = third_party/pigweed/repo
-	url = https://github.com/google/pigweed.git
+	url = https://github.com/pigweed-project/pigweed.git
 	branch  = main
 [submodule "openthread"]
 	path = third_party/openthread/repo

.pullapprove.yml

@@ -175,6 +175,14 @@ groups:
             teams: [reviewers-lg]
         reviews:
             request: 0 # Do not auto-add
+    shared-reviewers-morsemicro:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-morsemicro]
+        reviews:
+            request: 0 # Do not auto-add
     shared-reviewers-nordic:
         type: optional
         conditions:

config/common/cmake/Kconfig

@@ -698,6 +698,13 @@ config CHIP_WIFI_CONNECTION_RECOVERY_JITTER
 		a random jitter interval is added to it to avoid periodicity. The random jitter is selected
 		within a range of +/- the value of this option.
 
+config CHIP_WIFI_PAF
+	bool "Enable Wi-Fi with PAFTP support"
+	depends on CHIP_WIFI
+	help
+	  Enable PAFTP (Public Action Frame Transport Protocol) support for Matter-over-Wi-Fi devices.
+	  This allows the device to use Wi-Fi Aware (NAN) for commissioning and service discovery.
+
 # Platform additions and configuration
 
 config CHIP_SYSTEM_THREAD_LOCAL_STORAGE

config/common/cmake/chip_gn_kconfig_defaults.cmake

@@ -42,6 +42,7 @@ matter_add_gn_arg_bool("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
 matter_add_gn_arg_bool("chip_crypto_psa_aead_single_part" CONFIG_CHIP_CRYPTO_PSA_AEAD_SINGLE_PART)
 matter_add_gn_arg_bool("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT)
 matter_add_gn_arg_bool("chip_config_enable_groupcast" CONFIG_CHIP_ENABLE_GROUPCAST)
+matter_add_gn_arg_bool("chip_device_config_enable_wifipaf" CONFIG_CHIP_WIFI_PAF)
 
 # Allows to set chip_stack_lock_tracking level
 # Required in case default value needs to be set to "none" for optimization

config/nrfconnect/chip-module/Kconfig.defaults

@@ -58,6 +58,10 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
     default 2560 if CHIP_WIFI
     default 2048 if CHIP_ICD_LIT_SUPPORT
 
+config NET_MGMT_EVENT_STACK_SIZE
+    default 2048 if CHIP_WIFI_PAF
+    default 1024
+
 if CHIP_WIFI
 
 config HEAP_MEM_POOL_SIZE

config/nxp/chip-module/Kconfig.defaults

@@ -203,6 +203,7 @@ config INIT_STACKS
 	default y
 
 config NET_MGMT_EVENT_STACK_SIZE
+	default 2048 if CHIP_WIFI_PAF
 	default 1024
 
 config NET_MGMT_EVENT_QUEUE_SIZE

config/zephyr/Kconfig

@@ -99,6 +99,9 @@ config CHIP_CRYPTO_PSA
 	imply PSA_WANT_ALG_HMAC
 	imply PSA_WANT_ALG_ECDSA
 
+config CHIP_WIFI_PAF
+	imply WIFI_NM_WPA_SUPPLICANT_NAN if WIFI_NM_WPA_SUPPLICANT
+
 config CHIP_FACTORY_RESET_ERASE_SETTINGS
 	depends on SETTINGS_NVS || SETTINGS_ZMS