Home
last modified time | relevance | path

Searched full:merge (Results 1 – 25 of 150) sorted by relevance

123456

/Zephyr-latest/cmake/modules/
Droot.cmake25 # Merge in variables from other sources (e.g. sysbuild)
26 zephyr_get(MODULE_EXT_ROOT MERGE SYSBUILD GLOBAL)
27 zephyr_get(BOARD_ROOT MERGE SYSBUILD GLOBAL)
28 zephyr_get(SOC_ROOT MERGE SYSBUILD GLOBAL)
29 zephyr_get(ARCH_ROOT MERGE SYSBUILD GLOBAL)
30 zephyr_get(SCA_ROOT MERGE SYSBUILD GLOBAL)
31 zephyr_get(SNIPPET_ROOT MERGE SYSBUILD GLOBAL)
Dconfiguration_files.cmake30 # Merge in variables from other sources (e.g. sysbuild)
99 zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
100 zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
101 zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
/Zephyr-latest/share/sysbuild/cmake/modules/
Dsysbuild_root.cmake28 # Merge in variables from other sources
29 zephyr_get(MODULE_EXT_ROOT MERGE)
30 zephyr_get(BOARD_ROOT MERGE)
31 zephyr_get(SOC_ROOT MERGE)
32 zephyr_get(ARCH_ROOT MERGE)
33 zephyr_get(SCA_ROOT MERGE)
34 zephyr_get(SNIPPET_ROOT MERGE)
/Zephyr-latest/tests/cmake/zephyr_get/
DCMakeLists.txt192 zephyr_get(VARIABLE MERGE)
195 # Environment is not cached when using MERGE.
199 zephyr_get(VARIABLE MERGE)
207 zephyr_get(VARIABLE MERGE)
213 zephyr_get(VARIABLE MERGE)
220 zephyr_get(VARIABLE MERGE)
227 zephyr_get(TESTCASE_VARIABLE MERGE SYSBUILD LOCAL)
239 zephyr_get(TESTCASE_VARIABLE MERGE SYSBUILD GLOBAL)
253 zephyr_get(TESTCASE_VARIABLE MERGE SYSBUILD GLOBAL)
262 zephyr_get(TESTCASE_VARIABLE MERGE SYSBUILD LOCAL)
[all …]
/Zephyr-latest/scripts/schemas/
Dpatch-schema.yml55 # The URL of the upstream pull request to merge the patch
57 merge-pr:
67 # Whether the associated merge-pr has been merged
68 merge-status:
71 # The SHA-1 hash of the upstream git commit incorporating the associated merge-pr
73 merge-commit:
77 # The date the associated merge-pr was merged, in ISO 8601 date format YYYY-MM-DD
78 merge-date:
/Zephyr-latest/scripts/build/
Dmergehex.py28 ih.merge(to_merge, overlap=overlap)
30 raise AddressOverlapError("{} has merge issues".format(hex_file_path))
37 description="Merge hex files.",
44 "See IntelHex.merge() for more info.")
/Zephyr-latest/
D.gitlint7 # By default gitlint will ignore merge commits. Set to 'false' to disable.
8 ignore-merge-commits=false
52 # Whether to ignore this rule on merge commits (which typically only have a title)
54 ignore-merge-commits=false
/Zephyr-latest/.github/workflows/
Ddo_not_merge.yml1 name: Do Not Merge
8 do-not-merge:
Dcompliance.yml33 # Ensure there's no merge commits in the PR
35 (echo "::error ::Merge commits not allowed, rebase instead";false)
37 rm -fr ".git/rebase-merge"
Dready-to-merge.yml1 name: ready to merge
Dclang.yaml64 rm -fr ".git/rebase-merge"
145 - name: Merge Test Results
148 junitparser merge artifacts/*/twister.xml junit.xml
Dtwister.yaml87 rm -fr ".git/rebase-merge"
224 - name: Merge Test Results
227 junitparser merge artifacts/*/*/twister.xml junit.xml
251 uses: ./.github/workflows/ready-to-merge.yml
Dbsim-tests.yaml81 rm -fr ".git/rebase-merge"
173 - name: Merge Test Results
176 … junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
/Zephyr-latest/doc/services/device_mgmt/
Dmcumgr_backporting.rst84 #. Create the pull request selecting ``v2.7-branch`` as the merge target.
95 1. Create the pull request selecting ``v2.7-branch`` as the merge target.
108 As a maintainer, these are the steps required before proceeding with the merge process:
128 To merge a backported fix after the pull request for the fix has gone through the review process,
147 #. Push the reviewed pull-request branch to the newly created branch and merge the backport branch
156 Merge west.yml
159 As an MCUmgr maintainer, you may not be able to merge the ``west.yml`` update, to introduce the fix…
160 However, you are responsible for such a merge to happen as soon as possible after the MCUmgr fixes …
/Zephyr-latest/boards/common/
Dnios2.board.cmake7 # TODO: merge this script into nios2.py
/Zephyr-latest/subsys/testsuite/coverage/
Dcoverage.h89 * idiom. The number of counters is determined from the merge pointer
115 /* merge functions, null for unused*/
116 void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); member
/Zephyr-latest/doc/project/
Dproject_roles.rst107 approvals needed to merge a PR. Other criteria for merging may apply.
141 required approvals needed to merge a PR. Other criteria for merging may apply.
215 * Right to merge code changes to the zephyr tree following the project rules.
220 * Responsibility to merge all contributions regardless of their
222 maintainers and follow the merge criteria of a change.
273 … .. .. **Admin** **Merge Rights** Member Owner Collaborator
350 Merge Criteria
362 approvals, the merge criteria is extended with the guidelines below:
378 * Release engineers shall not merge code changes originating and reviewed
379 only by their own organisation. To be able to merge such changes, at least
Ddev_env_and_tools.rst26 release managers are allowed to merge a pull request into the main branch once
31 Give reviewers time to review before code merge
161 approvals are required to be able to merge a pull request. The person merging
162 the request can merge without approving or approve and merge to get to the 2
337 - This PR should not be merged (Do Not Merge). For work in progress, GitHub
351 PR complexity, affects how long a merge should be held to ensure proper
/Zephyr-latest/tests/kernel/device/
DCMakeLists.txt14 # at all. So add this flag to merge string constants such that
/Zephyr-latest/scripts/west_commands/
Dpatch.py76 merge-pr: https://github.com/zephyrproject-rtos/zephyr/pull/24486
78 merge-status: true
79 merge-commit: af926ae728c78affa89cbc1de811ab4211ed0f69
80 merge-date: 2020-04-27
/Zephyr-latest/subsys/net/lib/lwm2m/
DREADME_lwm2m24 If the patch fails to apply, you can attempt to use the 3-way merge capabilities by committing the …
/Zephyr-latest/drivers/i2c/
Di2c_numaker.c93 /* ACK/NACK last data byte, dependent on whether or not message merge is allowed */
120 * Different R/W bit so message merge is disallowed. in m_numaker_i2c_master_xfer_msg_read_last_byte()
133 /* ACK last data byte, so to merge adjacent messages into one transaction */ in m_numaker_i2c_master_xfer_msg_read_last_byte()
162 /* Read next data byte, involving ACK/NACK last data byte and message merge */
171 /* Last data byte ACKed, we'll do message merge */ in m_numaker_i2c_master_xfer_msg_read_next_byte()
184 /* End one message transfer, involving message merge and transfer end */
211 * Different R/W bit so message merge is disallowed. in m_numaker_i2c_master_xfer_msg_end()
216 LOG_WRN("Cannot merge adjacent messages, force I2C Repeat Start"); in m_numaker_i2c_master_xfer_msg_end()
229 /* Merge into the same transaction */ in m_numaker_i2c_master_xfer_msg_end()
/Zephyr-latest/cmake/
Dextra_flags.cmake4 # Note: zephyr_get MERGE should not be used until issue #43959 is resolved.
/Zephyr-latest/include/zephyr/xen/public/hvm/
Dparams.h7 * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
/Zephyr-latest/doc/_doxygen/
Ddoxygen-awesome-sidebar-only-darkmode-toggle.css14 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

123456