You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
doc: release-notes-changelog: Update Zephyr SHA after upmerge
Update Zephyr SHA in release notes after upmerging the sdk-zephyr
repository up to 684c9e8f32e4373a21098559f748f06915f950c9 (v4.4.0).
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
Copy file name to clipboardExpand all lines: doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -576,21 +576,21 @@ Zephyr
576
576
577
577
.. 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.
578
578
579
-
The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``93b5f19f994b9a9376985299c1427a1630f6950e``, with some |NCS| specific additions.
579
+
The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``684c9e8f32e4373a21098559f748f06915f950c9``, with some |NCS| specific additions.
580
580
581
581
For the list of upstream Zephyr commits (not including cherry-picked commits) incorporated into |NCS| since the most recent release, run the following command from the :file:`ncs/zephyr` repository (after running ``west update``):
582
582
583
583
.. code-block:: none
584
584
585
-
git log --oneline 93b5f19f99 ^911b3da139
585
+
git log --oneline 684c9e8f32 ^911b3da139
586
586
587
587
For the list of |NCS| specific commits, including commits cherry-picked from upstream, run:
588
588
589
589
.. code-block:: none
590
590
591
-
git log --oneline manifest-rev ^93b5f19f99
591
+
git log --oneline manifest-rev ^684c9e8f32
592
592
593
-
The current |NCS| main branch is based on revision ``93b5f19f99`` of Zephyr.
593
+
The current |NCS| main branch is based on revision ``684c9e8f32`` of Zephyr.
594
594
595
595
.. note::
596
596
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