Searched full:merging (Results 1 – 25 of 27) sorted by relevance
12
| /Zephyr-latest/doc/services/device_mgmt/ |
| D | mcumgr_backporting.rst | 103 This chapter describes the maintainers' side of accepting and merging fixes and backports.
115 The specific merging process depends on where the fix comes from and whether it is a *backport* or …
118 Merging a backported fix
150 Merging a new fix
153 Merging a new fix, that is not a backport of either any upstream or Zephyr fix, does not require an…
|
| /Zephyr-latest/.github/workflows/ |
| D | do_not_merge.yml | 9 name: Prevent Merging
|
| /Zephyr-latest/scripts/build/ |
| D | mergehex.py | 24 # start_addr to avoid conflicts when merging.
|
| /Zephyr-latest/doc/build/kconfig/ |
| D | setting.rst | 65 initial configuration is produced by merging a :file:`*_defconfig` file for the
127 The initial configuration for an application comes from merging configuration
155 :file:`prj_<build>.conf`, the result of merging :file:`prj_<build>.conf` and
160 configuration directory, the result of merging it with :file:`prj.conf` is
165 configuration directory, the result of merging it with :file:`prj.conf` and
|
| D | tips.rst | 397 in the build directory by merging configuration files (including e.g.
|
| /Zephyr-latest/dts/bindings/i2c/ |
| D | nordic,nrf-twim.yaml | 33 Size of a concatenation buffer that the driver is to use for merging
|
| /Zephyr-latest/doc/services/tfm/ |
| D | requirements.rst | 60 Part of the process of generating binaries for QEMU and merging signed
|
| /Zephyr-latest/doc/project/ |
| D | code_flow.rst | 44 * Define exit criteria for merging the collaboration branch changes back into the main branch.
|
| D | dev_env_and_tools.rst | 160 the person merging the pull-request (merging != approval), two additional
161 approvals are required to be able to merge a pull request. The person merging
|
| D | project_roles.rst | 71 respect to accepting and merging a pull request. However, Contributors comments
107 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.
|
| D | release_process.rst | 57 A relatively straightforward discipline is followed with regard to the merging
|
| /Zephyr-latest/doc/build/dts/ |
| D | intro-input-output.rst | 72 allows merging overlapping definitions of nodes in the devicetree. See
|
| /Zephyr-latest/scripts/ci/ |
| D | pylintrc | 177 consider-merging-isinstance,
|
| /Zephyr-latest/doc/develop/ |
| D | modules.rst | 161 **Updating modules by merging the upstream branch:**
164 pull request against the module main branch, and merging the pull request using
247 Submitting and merging changes directly to a module's codebase, that is,
275 The merging of pull requests in the main branch of a module
1140 To avoid merging changes to master with pull request information, the pull
|
| /Zephyr-latest/scripts/kconfig/ |
| D | kconfig.py | 9 # Writes/updates the zephyr/.config configuration file by merging configuration
|
| D | kconfiglib.py | 746 merging configurations.
753 merging configurations.
1212 loading (replace == True) and merging (replace == False).
3417 # merging lists when possible (e.g. when ANDing two AND expressions),
|
| /Zephyr-latest/doc/contribute/ |
| D | guidelines.rst | 755 controlled changes. This practice simplifies review, makes merging and
860 as the commits will be rebased as part of merging anyway, and triggering
1064 - The Architecture WG must specify the procedure for merging any PRs associated
|
| /Zephyr-latest/doc/connectivity/bluetooth/api/mesh/ |
| D | access.rst | 122 lists. The mesh stack implements this by merging the subscription lists of the
|
| /Zephyr-latest/doc/build/cmake/ |
| D | index.rst | 116 configuration is generated by merging configuration fragments from the board
|
| /Zephyr-latest/subsys/llext/ |
| D | llext_load.c | 338 * Before merging this section in the region, in llext_map_sections()
|
| /Zephyr-latest/doc/security/ |
| D | security-overview.rst | 408 the precommit procedure. Prior to merging large pieces of code
|
| /Zephyr-latest/ |
| D | Kconfig.zephyr | 14 # After merging all definitions for a symbol/choice, Kconfig picks the first
|
| /Zephyr-latest/doc/_extensions/zephyr/domain/ |
| D | __init__.py | 761 # potentially needs merging since a board's docname property is set by BoardDirective to
|
| /Zephyr-latest/scripts/dts/python-devicetree/src/devicetree/ |
| D | edtlib.py | 340 # Returns the contents of the binding given by 'fname' after merging
1904 The final DTS source code of the loaded devicetree after merging nodes
|
| /Zephyr-latest/doc/releases/ |
| D | release-notes-3.4.rst | 650 * Enhanced ``zephyr_get`` CMake helper function to optionally support merging
|
12
