sdk-zephyr-upmerge

.clang-format

@@ -32,11 +32,14 @@ ColumnLimit: 100
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 ForEachMacros:
+  - 'ARRAY_FOR_EACH'
+  - 'ARRAY_FOR_EACH_PTR'
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
   - 'FOR_EACH_IDX'
   - 'FOR_EACH_IDX_FIXED_ARG'
   - 'FOR_EACH_NONEMPTY_TERM'
+  - 'FOR_EACH_FIXED_ARG_NONEMPTY_TERM'
   - 'RB_FOR_EACH'
   - 'RB_FOR_EACH_CONTAINER'
   - 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -66,8 +69,16 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
   - 'STRUCT_SECTION_FOREACH'
+  - 'STRUCT_SECTION_FOREACH_ALTERNATE'
   - 'TYPE_SECTION_FOREACH'
   - 'K_SPINLOCK'
+  - 'COAP_RESOURCE_FOREACH'
+  - 'COAP_SERVICE_FOREACH'
+  - 'COAP_SERVICE_FOREACH_RESOURCE'
+  - 'HTTP_RESOURCE_FOREACH'
+  - 'HTTP_SERVER_CONTENT_TYPE_FOREACH'
+  - 'HTTP_SERVICE_FOREACH'
+  - 'HTTP_SERVICE_FOREACH_RESOURCE'
 IfMacros:
   - 'CHECKIF'
 # Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
@@ -82,8 +93,10 @@ IncludeCategories:
   - Regex: '.*'
     Priority: 3
 IndentCaseLabels: false
+IndentGotoLabels: false
 IndentWidth: 8
 InsertBraces: true
+SpaceBeforeInheritanceColon: False
 SpaceBeforeParens: ControlStatementsExceptControlMacros
 SortIncludes: Never
 UseTab: ForContinuationAndIndentation

.codechecker.yml

@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2024, Basalte bv
+
+analyzer:
+  # Start by disabling all
+  - --disable-all
+
+  # Enable the sensitive profile
+  - --enable=sensitive
+
+  # Disable unused cases
+  - --disable=boost
+  - --disable=mpi
+
+  # Many identifiers in zephyr start with _
+  - --disable=clang-diagnostic-reserved-identifier
+  - --disable=clang-diagnostic-reserved-macro-identifier
+
+  # Cleanup
+  - --clean

.github/ISSUE_TEMPLATE/001_bug_report.md

@@ -6,8 +6,8 @@ labels: bug
 assignees: ''
 
 ---
-
-**Notes (delete this)**
+<!--
+**Notes**
 Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
 are available to first verify that the issue is a genuine Zephyr bug and not a
 consequence of Zephyr services misuse.
@@ -16,8 +16,10 @@ This issue list is only for bugs in the main Zephyr code base
 (https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
 fork (such as NCS) specific feature, please open an issue in the fork project
 instead.
+-->
 
 **Describe the bug**
+<!--
 A clear and concise description of what the bug is.
 
 Please also mention any information which could help others to understand
@@ -27,31 +29,43 @@ the problem you're facing:
  - Is this a regression? If yes, have you been able to "git bisect" it to a
    specific commit?
  - ...
+-->
 
 **To Reproduce**
+<!--
 Steps to reproduce the behavior:
 1. mkdir build; cd build
 2. cmake -DBOARD=board\_xyz
 3. make
 4. See error
+-->
 
 **Expected behavior**
+<!--
 A clear and concise description of what you expected to happen.
+-->
 
 **Impact**
+<!--
 What impact does this issue have on your progress (e.g., annoyance, showstopper)
+-->
 
 **Logs and console output**
+<!--
 If applicable, add console logs or other types of debug information
 e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
 copy-and-paste text and put a code fence (\`\`\`) before and after, to help
 explain the issue. (if unable to obtain text log, add a screenshot)
+-->
 
 **Environment (please complete the following information):**
+
  - OS: (e.g. Linux, MacOS, Windows)
  - Toolchain (e.g Zephyr SDK, ...)
  - Commit SHA or Version used
 
 **Additional context**
+<!--
 Add any other context that could be relevant to your issue, such as pin setting,
 target configuration, ...
+-->

.github/ISSUE_TEMPLATE/002_enhancement.md

@@ -8,13 +8,21 @@ assignees: ''
 ---
 
 **Is your enhancement proposal related to a problem? Please describe.**
+<!--
 A clear and concise description of what the problem is.
+-->
 
 **Describe the solution you'd like**
+<!--
 A clear and concise description of what you want to happen.
+-->
 
 **Describe alternatives you've considered**
+<!--
 A clear and concise description of any alternative solutions or features you've considered.
+-->
 
 **Additional context**
+<!--
 Add any other context or graphics (drag-and-drop an image) about the feature request here.
+-->

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

@@ -9,43 +9,52 @@ assignees: ''
 
 ## Introduction
 
+<!--
 This section targets end users, TSC members, maintainers and anyone else that might
 need a quick explanation of your proposed change.
+-->
 
 ### Problem description
-
+<!--
 Why do we want this change and what problem are we trying to address?
+-->
 
 ### Proposed change
-
+<!--
 A brief summary of the proposed change - the 10,000 ft view on what it will
 change once this change is implemented.
+-->
 
 ## Detailed RFC
-
+<!--
 In this section of the document the target audience is the dev team. Upon
 reading this section each engineer should have a rather clear picture of what
 needs to be done in order to implement the described feature.
+-->
 
 ### Proposed change (Detailed)
-
+<!--
 This section is freeform - you should describe your change in as much detail
 as possible. Please also ensure to include any context or background info here.
 For example, do we have existing components which can be reused or altered.
 
 By reading this section, each team member should be able to know what exactly
 you're planning to change and how.
+-->
 
 ### Dependencies
-
+<!--
 Highlight how the change may affect the rest of the project (new components,
 modifications in other areas), or other teams/projects.
+-->
 
 ### Concerns and Unresolved Questions
-
+<!--
 List any concerns, unknowns, and generally unresolved questions etc.
+-->
 
 ## Alternatives
-
+<!--
 List any alternatives considered, and the reasons for choosing this option
 over them.
+-->

.github/ISSUE_TEMPLATE/004_feature_request.md

@@ -8,13 +8,21 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
+<!--
 A clear and concise description of what the problem is.
+-->
 
 **Describe the solution you'd like**
+<!--
 A clear and concise description of what you want to happen.
+-->
 
 **Describe alternatives you've considered**
+<!--
 A clear and concise description of any alternative solutions or features you've considered.
+-->
 
 **Additional context**
+<!--
 Add any other context or graphics (drag-and-drop an image) about the feature request here.
+-->

.github/SECURITY.md

@@ -11,9 +11,9 @@ updates:
 At this time, with the latest release of v3.6, the supported
 versions are:
 
-  - v2.7: Current LTS
-  - v3.5: Prior release
-  - v3.6: Current release
+  - v3.7: Current LTS
+  - v3.6: Prior release
+  - v2.7: Prior LTS
 
 ## Reporting process
 

.github/workflows/backport_issue_check.yml

@@ -2,12 +2,20 @@ name: Backport Issue Check
 
 on:
   pull_request_target:
+    types:
+      - edited
+      - opened
+      - reopened
+      - synchronize
     branches:
       - v*-branch
 
 jobs:
   backport:
     name: Backport Issue Check
+    concurrency:
+      group: backport-issue-check-${{ github.ref }}
+      cancel-in-progress: true
     runs-on: ubuntu-22.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 

.github/workflows/bsim-tests-publish.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           run_id: ${{ github.event.workflow_run.id }}