Home
last modified time | relevance | path

Searched +full:merge +full:- +full:commit (Results 1 – 22 of 22) sorted by relevance

/Zephyr-latest/scripts/schemas/
Dpatch-schema.yml3 # SPDX-License-Identifier: Apache-2.0
8 schema;patch-schema:
11 - type: map
14 # The path to the patch file, relative to patch-base
15 # E.g. zephyr/kernel-pipe-fix-not-k-no-wait-and-ge-min-xfer-bytes.patch
20 # The SHA-256 checksum of the patch file
25 pattern: "^[0-9a-f]{64}$"
44 # The date the patch was created, in ISO 8601 date format YYYY-MM-DD
48 format: "%Y-%m-%d"
55 # The URL of the upstream pull request to merge the patch
[all …]
/Zephyr-latest/
D.gitlint2 # Zephyr-specific defaults are located in scripts/gitlint/zephyr_commit_rules.py
4 ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
5 # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
7 # By default gitlint will ignore merge commits. Set to 'false' to disable.
8 ignore-merge-commits=false
9 ignore-revert-commits=false
10 ignore-fixup-commits=false
11 ignore-squash-commits=false
15 # Set the extra-path where gitlint will search for user defined rules
17 extra-path=scripts/gitlint
[all …]
/Zephyr-latest/doc/services/device_mgmt/
Dmcumgr_backporting.rst15 The upstream MCUmgr repository is located `in this page <https://github.com/apache/mynewt-mcumgr>`_.
16 The Zephyr fork used in version 2.7 and earlier is `located here <https://github.com/zephyrproject-…
17 …rary that is `part of the Zephyr code base <https://github.com/zephyrproject-rtos/zephyr/tree/main…
27 … done directly to the Zephyr held code of the MCUmgr library, is backported to the ``v2.7-branch``.
28 … ported to the Zephyr held code from the upstream repository, is backported to the ``v2.7-branch``.
30 to the ``v2.7-branch``.
32 directly applied to the ``v2.7-branch``.
56 You must also apply the ``backport v2.7-branch`` label to the bug report.
61 You can either create a *backport pull request* or a *new-fix pull request*.
64 -------------------------------
[all …]
/Zephyr-latest/doc/contribute/
Dcontributor_expectations.rst1 .. _contributor-expectations:
10 - Reviewed more quickly and reviewed more thoroughly. It's easier for reviewers
14 - Less wasted work if reviewers or maintainers reject the direction of the
17 - Easier to rebase and merge. Smaller PRs are less likely to conflict with other
20 - Easier to revert if the PR breaks functionality.
32 - Smaller PRs should encompass one self-contained logical change.
34 - When adding a new large feature or API, the PR should address only one part of
38 - PRs should include tests or samples under the following conditions:
40 - Adding new features or functionality.
42 - Modifying a feature, especially for API behavior contract changes.
[all …]
Dguidelines.rst6 As an open-source project, we welcome and encourage the community to submit
52 https://github.com/zephyrproject-rtos/zephyr/blob/main/LICENSE
54 .. _GitHub repo: https://github.com/zephyrproject-rtos/zephyr
66 https://www.zephyrproject.org/faqs/#1571346989065-9216c551-f523
69 https://www.whitesourcesoftware.com/whitesource-blog/top-10-apache-license-questions-answered/
92 See :ref:`external-contributions` for more information about
112 .. code-block:: C
117 https://www.linuxfoundation.org/blog/copyright-notices-in-open-source-software-projects/
129 developer. In the commit message of the contribution, (described more fully
130 later in this document), the developer simply adds a ``Signed-off-by``
[all …]
/Zephyr-latest/scripts/west_commands/
Dpatch.py3 # SPDX-License-Identifier: Apache-2.0
30 WEST_PATCH_SCHEMA_PATH = Path(__file__).parents[1] / "schemas" / "patch-schema.yml"
57 See "west patch apply --help" for details.
62 See "west patch clean --help" for details.
67 See "west patch list --help" for details.
71 Run "west patch gh-fetch" to fetch patches from Github.
72 See "west patch gh-fetch --help" for details.
76 The patches.yml syntax is described in "scripts/schemas/patch-schema.yml".
79 - path: zephyr/kernel-pipe-fix-not-k-no-wait-and-ge-min-xfer-bytes.patch
84 date: 2020-04-20
[all …]
/Zephyr-latest/subsys/net/lib/lwm2m/
DREADME_lwm2m2 ----------------------
13 The CDDL description is based on the RFC 8428 - Sensor Measurement Lists (SenML). For further
14 details please see the chapter 11 - CDDL.
19 pip install --upgrade zcbor
24 …you can attempt to use the 3-way merge capabilities by committing the un-patched changes (i.e. up …
27 git am -3 < lwm2m_senml_cbor.patch
30 …e unpatched changes, then committing the desired patches in a subsequent commit, then creating the…
33 git format-patch --stdout HEAD~1.. > lwm2m_senml_cbor.patch
/Zephyr-latest/doc/develop/
Dmodules.rst7 order to avoid reinventing the wheel and to reuse as much well-established,
14 modules, an external project is required to have its own life-cycle outside
29 - Debugger integration
30 - Silicon vendor Hardware Abstraction Layers (HALs)
31 - Cryptography libraries
32 - File Systems
33 - Inter-Process Communication (IPC) libraries
36 references to optional :ref:`binary blobs <bin-blobs>`.
41 .. _modules-vs-projects:
47 <west-workspace>`. In fact, modules :ref:`do not require west
[all …]
/Zephyr-latest/doc/project/
Ddev_env_and_tools.rst1 .. _dev-environment-and-tools:
9 GitHub is intended to provide a framework for reviewing every commit before it
26 release managers are allowed to merge a pull request into the main branch once
31 Give reviewers time to review before code merge
42 code-owner review. Additionally, some changes might require further discussions
50 :figclass: align-center
55 ---------
57 - An author of a change can suggest in his pull-request which category a change
61 - The project will use the label system to categorize the pull requests.
62 - Changes should not be merged before the minimal time has expired.
[all …]
Dproject_roles.rst51 (https://github.com/zephyrproject-rtos/zephyr/blob/main/CODE_OF_CONDUCT.md)
54 ….github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permiss…
112 not follow the :ref:`expectations <reviewer-expectations>` and the guidelines
117 approvals needed to merge a PR. Other criteria for merging may apply.
151 required approvals needed to merge a PR. Other criteria for merging may apply.
181 :ref:`expectations <reviewer-expectations>` from reviewers and seek reviews
185 * Responsibility to re-assign a pull request if they are the original submitter
210 .. _release-engineering-team:
225 * Right to merge code changes to the zephyr tree following the project rules.
230 * Responsibility to merge all contributions regardless of their
[all …]
Drelease_process.rst6 The Zephyr project releases on a time-based cycle, rather than a feature-driven
10 A time-based release process enables the Zephyr project to provide users with a
12 roughly 4-month release cycle allows the project to coordinate development of
19 - Release tagging procedure:
21 - linear mode on main branch,
22 - release branches for maintenance after release tagging.
23 - Each release period will consist of a development phase followed by a
29 - Development phase: all changes are considered and merged, subject to
31 - Stabilisation phase: the release manager creates a vN-rc1 tag and the tree
33 - CI sees the tag, builds and runs tests; Test teams analyse the report from the
[all …]
/Zephyr-latest/doc/develop/west/
Dbuilt-in.rst1 .. _west-built-in-cmds:
3 Built-in commands
6 This page describes west's built-in commands, some of which were introduced in
7 :ref:`west-basics`, in more detail.
20 For additional help, run ``west <command> -h`` (e.g. ``west init -h``).
22 .. _west-init:
34 .. code-block:: none
36 west init [-m URL] [--mr REVISION] [--mf FILE] [directory]
40 the ``-m`` switch, the initial revision to check out using ``--mr``, and
41 the location of the manifest file within the repository using ``--mf``.
[all …]
Dworkspaces.rst1 .. _west-workspaces:
7 :ref:`west-basics` in more detail.
9 .. _west-manifest-rev:
11 The ``manifest-rev`` branch
14 West creates and controls a Git branch named ``manifest-rev`` in each
16 specified for the project at the time :ref:`west-update` was last run.
17 Other workspace management commands may use ``manifest-rev`` as a reference
19 purposes, the ``manifest-rev`` branch allows the manifest file to use SHAs
22 Although ``manifest-rev`` is a normal Git branch, west will recreate and/or
27 rebase it on top of a new ``manifest-rev``, or merge ``manifest-rev`` into
[all …]
/Zephyr-latest/doc/releases/
Drelease-notes-1.10.rst12 * Initial alpha-quality thread-level memory protection on x86, userspace and memory
27 * Initial alpha-quality thread-level memory protection on x86, userspace and memory
35 * Memory domain APIs for fine-tuning memory region permissions
38 * Add the following application-facing memory domain APIs:
40 * k_mem_domain_init() - to initialize a memory domain
41 * k_mem_domain_destroy() - to destroy a memory domain
42 * k_mem_domain_add_partition() - to add a partition into a domain
43 * k_mem_domain_remove_partition() - to remove a partition from a domain
44 * k_mem_domain_add_thread() - to add a thread into a domain
45 * k_mem_domain_remove_thread() - to remove a thread from a domain
[all …]
Drelease-notes-1.7.rst10 nano- and micro-kernel APIs found in the 1.5.0 release and earlier.
52 * Added NXP FRDM-KW41Z board
53 * Added ST Nucleo-F334R8, Nucleo-L476G, STM3210C-EVAL, and STM32373C-EVAL boards
102 * Created net-shell module for interacting with network sub-system.
136 * Imported Segger J-Link RTT library
145 * New local-content generation theme (read-the-docs)
147 * Site-wide glossary added.
150 * Improved consistency of :ref:`boards` and :zephyr:code-sample-category:`samples`.
159 * ``ZEP-19`` - IPSP node support
160 * ``ZEP-145`` - no 'make flash' for Arduino Due
[all …]
Drelease-notes-2.7.rst17 * Support for M-Profile Vector Extensions (MVE) on ARMv8.1-M
18 * Improved thread safety for Newlib and C++ on SMP-capable systems
20 * New Action-based Power Management API
23 * Linker Support for Tightly-Coupled Memory in RISC-V
25 * Support for extended PCI / PCIe capabilities, improved MIS-X support
33 * The kernel now supports both 32- and 64-bit architectures
36 * We added support for Point-to-Point Protocol (PPP)
37 * We added support for UpdateHub, an end-to-end solution for over-the-air device updates
38 * We added support for ARM Cortex-R Architecture
40 * Expanded support for ARMv6-M architecture
[all …]
Drelease-notes-2.2.rst18 * Fix CVE-2020-10028
19 * Fix CVE-2020-10060
20 * Fix CVE-2020-10063
21 * Fix CVE-2020-10066
32 * :github:`23494` - Bluetooth: LL/PAC/SLA/BV-01-C fails if Slave-initiated Feature Exchange is disa…
33 * :github:`23485` - BT: host: Service Change indication sent regardless of whether it is needed or …
34 * :github:`23482` - 2M PHY + DLE and timing calculations on an encrypted link are wrong
35 * :github:`23070` - Bluetooth: controller: Fix ticker implementation to avoid catch up
36 * :github:`22967` - Bluetooth: controller: ASSERTION FAIL on invalid packet sequence
37 * :github:`24183` - [v2.2] Bluetooth: controller: split: Regression slave latency during connection…
[all …]
Drelease-notes-1.13.rst16 * Support for IEEE 802.1AS-2011 generalized Precision Time Protocol (gPTP)
23 * Basic support for Arm TrustZone in Armv8-M
42 * arch: arm: implement ARMv8-M MPU driver
44 * arch: arm: macro API for defining non-secure entry functions
48 * arch: ARM: Change the march used by cortex-m0 and cortex-m0plus
50 * arch: arm: basic Arm TrustZone-M functionality for Cortex-M23 and Cortex-M33
51 * arch: arm: built-in stack protection using Armv8-M SPLIM registers
52 * arch: arm: API for using TT intrinsics in Secure/Non-Secure Armv8-M firmware
63 * riscv32: riscv-privilege: Microsemi Mi-V support
99 * modem: Added Wistron WNC-M14A2A LTE-M Modem driver
[all …]
Drelease-notes-1.14.rst17 * CVE-2020-10066
18 * CVE-2020-10069
19 * CVE-2020-13601
20 * CVE-2020-13602
32 * :github:`issuenumber` - issue title
34 * :github:`18334` - DNS resolution is broken for some addresses in master/2.0-pre
35 * :github:`19917` - Bluetooth: Controller: Missing LL_ENC_RSP after HCI LTK Negative Reply
36 * :github:`21107` - LL_ASSERT and 'Imprecise data bus error' in LL Controller
37 * :github:`21257` - tests/net/net_pkt failed on mimxrt1050_evk board.
38 * :github:`21299` - bluetooth: Controller does not release buffer on central side after peripheral …
[all …]
Drelease-notes-1.12.rst12 - Asymmetric multiprocessing (AMP) via integration of OpenAMP
13 - Persistent storage support for Bluetooth Low Energy including Mesh
14 - 802.1Q - Virtual Local Area Network (VLAN) traffic on an Ethernet network
15 - Support multiple concurrent filesystem devices, partitions, and FS types
16 - Ethernet network management interface
17 - Networking traffic prioritization on a per-connection basis
18 - Support for Ethernet statistical counters
19 - Support for TAP net device on the native POSIX port
20 - Command-line Zephyr meta-tool "west"
21 - SPI slave support
[all …]
Drelease-notes-2.6.rst13 * Added support for 64-bit ARCv3
14 * Split ARM32 and ARM64, ARM64 is now a top-level architecture
15 * Added initial support for Arm v8.1-m and Cortex-M55
22 https://github.com/zephyrproject-rtos/example-application
34 * CVE-2021-3581: Under embargo until 2021-09-04
41 <https://github.com/zephyrproject-rtos/zephyr/issues?q=is%3Aissue+is%3Aopen+label%3Abug>`_.
46 * Driver APIs now return ``-ENOSYS`` if optional functions are not implemented.
47 If the feature is not supported by the hardware ``-ENOTSUP`` will be returned.
48 Formerly ``-ENOTSUP`` was returned for both failure modes, meaning this change
194 * Added support for null pointer dereferencing detection in Cortex-M.
[all …]
/Zephyr-latest/scripts/kconfig/
Dkconfiglib.py1 # Copyright (c) 2011-2019, Ulf Magnusson
2 # SPDX-License-Identifier: ISC
9 from Kconfig (https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt)
27 $ wget -qO- https://raw.githubusercontent.com/ulfalizer/Kconfiglib/master/makefile.patch | git am
28 …$ wget -qO- https://raw.githubusercontent.com/ulfalizer/Kconfiglib/master/makefile.patch | patch -…
30 Warning: Not passing -p1 to patch will cause the wrong file to be patched.
43 $ git am Kconfiglib/makefile.patch (or 'patch -p1 < Kconfiglib/makefile.patch')
53 ----------------
61 --------------
69 --------------------------------
[all …]