Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

triazo / kernel

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 3
  • Merge Requests 0
  • Wiki
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !6 opened Sep 13, 2015 by malcolm@malcolm 

Protected

Code for preparing for protected mode (gdt, stack, etc.). Does not put kernel in proper memory.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b protected origin/protected

Step 2. Review the changes locally

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

git checkout master
git merge --no-ff protected

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.

  • Discussion 1
  • Commits 5
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • triazo @triazo commented Sep 13, 2015
    Master

    Cool. Kernel still needs to be loaded but this is a step in the right direction.

    Cool. Kernel still needs to be loaded but this is a step in the right direction.
  • triazo @triazo

    mentioned in commit 490cafc1

    Sep 13, 2015

    mentioned in commit 490cafc1

    mentioned in commit 490cafc15711a9b0337fde6fb31772d8a9b0d049
    Toggle commit list
  • triazo @triazo

    Status changed to merged

    Sep 13, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!6