Skip to content

Merge master to srelease 5 of 7

Created by: silabs-robin

This PR starts the effort of syncing the two branches master and cv32e40s/release.

Passes ci_check.

Method: Found old PR merge commits going into master, then merged a few of them one at a time into s/release.

(There was some, but not many, merge conflicts.)


Just for completeness and future reference, here are my notes on it while working:

$ git merge-base master cv32e40s/release
267ba26c53fd9c94f89226b21bed9f6796d6d454

lines 331-408 byte 19584  (press RETURN)

331    (common ancestor)
300    e326a53f4345921d0107c4ccc6d58c939d25d21e  1/7  (ci_check pass)
250    0ee78d8ee17158a8c07a3d975bfd7efc19946c4f  2/7  (ci_check pass)
200    3d661dce41a380b5e9a32bcbe0d25fdf31a9c47f  3/7  (ci_check pass)
150    055a29ea008e0836c9ed988d1f079eaeea60eec8  4/7  (ci_check pass)
100    a687a6023b3204881a9fa2ba10d394f5f3e8f8b2  5/7  (ci_check pass)
50     67791932df6128671344015584109d7a177d9a9a  6/7
???  1955db4ef70b853b7dd94195533f0b10a313eaac
1      "master"

Merge request reports

Loading