Skip to content

Commit

Permalink
doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge
Browse files Browse the repository at this point in the history
Update upstream Zephyr SHA to ea02b93.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
  • Loading branch information
rlubos committed May 27, 2024
1 parent 90b5a41 commit 985fbed
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -945,21 +945,21 @@ Zephyr

.. NOTE TO MAINTAINERS: All the Zephyr commits in the below git commands must be handled specially after each upmerge and each nRF Connect SDK release.
The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``0051731a41fa2c9057f360dc9b819e47b2484be5``, with some |NCS| specific additions.
The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``ea02b93eea35afef32ebb31f49f8e79932e7deee``, with some |NCS| specific additions.

For the list of upstream Zephyr commits (not including cherry-picked commits) incorporated into nRF Connect SDK since the most recent release, run the following command from the :file:`ncs/zephyr` repository (after running ``west update``):

.. code-block:: none
git log --oneline 0051731a41 ^23cf38934c
git log --oneline ea02b93eea ^23cf38934c
For the list of |NCS| specific commits, including commits cherry-picked from upstream, run:

.. code-block:: none
git log --oneline manifest-rev ^0051731a41
git log --oneline manifest-rev ^ea02b93eea
The current |NCS| main branch is based on revision ``0051731a41`` of Zephyr.
The current |NCS| main branch is based on revision ``ea02b93eea`` of Zephyr.

.. note::
For possible breaking changes and changes between the latest Zephyr release and the current Zephyr version, refer to the :ref:`Zephyr release notes <zephyr_release_notes>`.
Expand Down

0 comments on commit 985fbed

Please sign in to comment.