Skip to content

Commit fef5817

Browse files
committed
doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge
Update upstream Zephyr SHA to ea02b93. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
1 parent e3ee414 commit fef5817

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -950,21 +950,21 @@ Zephyr
950950

951951
.. 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.
952952
953-
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.
953+
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.
954954

955955
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``):
956956

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

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

969969
.. note::
970970
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>`.

0 commit comments

Comments
 (0)