Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Sign in
P
Platform-independent core collection
  • Project
    • Project
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 10
    • Issues 10
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 4
    • Merge Requests 4
  • Wiki
    • Wiki
  • image/svg+xml
    Discourse
    • Discourse
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Projects
  • Platform-independent core collection
  • Merge Requests
  • !5

Closed
Opened Mar 03, 2020 by Dimitris Lampridis@dlampridis
  • Report abuse
Report abuse

[sw][driver][i2c] make i2c-ocores work with kernels 4.7 and newer

This is an alternative approach to achieve the same goal as !2 (closed) .

Therefore we should only merge one of the two requests.

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/i2c/modernise origin/feature/i2c/modernise

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/proposed_master
git merge --no-ff feature/i2c/modernise

Step 4. Push the result of the merge to GitLab

git push origin proposed_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 1
  • Changes 1
Federico Vaga
Assignee
Federico Vaga @FedericoVaga
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: project/general-cores!5