Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
W
White Rabbit core collection
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 30
    • Issues 30
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Schedules
  • Wiki
    • Wiki
  • image/svg+xml
    Discourse
    • Discourse
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Projects
  • White Rabbit core collection
  • Merge Requests
  • !3

Open
Opened Jan 13, 2023 by Peter Jansweijer@peterj
  • Report abuse
Report abuse

Revert gtp_bitslide.vhd SHA-1: c9cc5cab back to…

Revert gtp_bitslide.vhd SHA-1: c9cc5cab back to version SHA-1: 8a4c3198 SHA-1: c9cc5caba slightly changed the behavior of gtp_rx_cdr_rst_o which breaks proper functionality. Artix-7 GTP failed to properly align with a matching bitslide value.

See also mail to author tomasz.wlostowski@cern.ch 'gtp_bitslide.vhd and testing wrpc-v5' 3-11-2022 12:25

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b peter_revert_gtp_bitslide origin/peter_revert_gtp_bitslide

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/wrpc-v5
git merge --no-ff peter_revert_gtp_bitslide

Step 4. Push the result of the merge to GitLab

git push origin wrpc-v5

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 1
  • Pipelines 1
  • Changes 1
Tristan Gingold
Assignee
Tristan Gingold @tgingold
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
bug
Assign labels
  • View project labels
Reference: project/wr-cores!3