Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
K
kernel
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 6
    • Issues 6
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Metrics
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • teligen_admin
  • kernel
  • Merge Requests
  • !21

Merged
Opened Dec 01, 2023 by teligen_admin@Teligen_adminMaintainer
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch origin
git checkout -b "hopestage-v2.0" "origin/hopestage-v2.0"

Step 2. Review the changes locally

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

git fetch origin
git checkout "hopestage-v2.0"
git merge --no-ff "hopestage-v2.0"

Step 4. Push the result of the merge to GitLab

git push origin "hopestage-v2.0"

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

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

HS:Fix the write_fcsr() macro for loongarch64

  • Overview 6
  • Commits 1
  • Changes 2

http://10.30.33.235/hopeproductsgrp/hopestagegrp/bugzilla/-/issues/210

  • 解决编译错误:
    [ 359s] {standard input}: Assembler messages:
    [ 359s] {standard input}:2106: Error: no match insn: movgr2fcsr $r12,$r0
    [ 359s] make[2]: *** [scripts/Makefile.build:286: arch/loongarch/kernel/traps.o] Error 1
    [ 359s] make[1]: *** [scripts/Makefile.build:503: arch/loongarch/kernel] Error 2
    [ 359s] make: *** [Makefile:1846: arch/loongarch] Error 2
    [ 359s] error: Bad exit status from /var/tmp/rpm-tmp.UoJ1We (%build)
    image

  • 龙芯架构编译时输出错误:error: Empty %files file /home/abuild/rpmbuild/BUILD/kernel-5.10.0/kernel-tools-debugfiles.list
    为规避错误,龙芯架构不生成kernel的debuginfo和debugsource包

Edited Dec 06, 2023 by teligen_admin
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: Teligen_admin/kernel!21
Source branch: hopestage-v2.0

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.