Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
Q
qemu-usermode
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • qemu-usermode
  • Merge Requests
  • !10

Merged
Opened Jan 24, 2020 by frajo@frajo
  • Report abuse
Report abuse

[qemu-usermode] Update to 4.0.1. JB#45765

  • Overview 0
  • Commits 2
  • Changes 277

I am still doing builds of this but here is a preliminary update to 4.0.1.

Check out, review, and merge locally

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

git fetch "https://git.sailfishos.org/frajo/qemu-usermode.git" "jb45765"
git checkout -b "frajo/qemu-usermode-jb45765" FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout "origin/master"
git merge --no-ff "frajo/qemu-usermode-jb45765"

Step 4. Push the result of the merge to GitLab

git push origin "master"

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

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

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/qemu-usermode!10

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.