Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ef9f7cfa

Commit ef9f7cfa authored 4 years ago by Michael Ellerman

Downloads
- Plain Diff

Merge branch 'fixes' into next

Merge our fixes branch, primarily to bring in the ebb selftests build
fix and the pkey fix, which is a dependency for some future work.

parents 61f879d9 f0479c4b

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/powerpc/vas-api.rst 1 addition, 1 deletion

Documentation/powerpc/vas-api.rst
arch/powerpc/include/asm/icswx.h 2 additions, 0 deletions

arch/powerpc/include/asm/icswx.h
arch/powerpc/kernel/exceptions-64s.S 1 addition, 1 deletion

arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/paca.c 1 addition, 1 deletion

arch/powerpc/kernel/paca.c
arch/powerpc/kvm/book3s_64_mmu_radix.c 2 additions, 1 deletion

arch/powerpc/kvm/book3s_64_mmu_radix.c
arch/powerpc/mm/book3s64/pkeys.c 7 additions, 8 deletions

arch/powerpc/mm/book3s64/pkeys.c
arch/powerpc/mm/nohash/kaslr_booke.c 1 addition, 0 deletions

arch/powerpc/mm/nohash/kaslr_booke.c
arch/powerpc/platforms/powernv/vas-fault.c 1 addition, 1 deletion

arch/powerpc/platforms/powernv/vas-fault.c
tools/testing/selftests/powerpc/nx-gzip/gunz_test.c 2 additions, 2 deletions

tools/testing/selftests/powerpc/nx-gzip/gunz_test.c
tools/testing/selftests/powerpc/nx-gzip/gzfht_test.c 2 additions, 2 deletions

tools/testing/selftests/powerpc/nx-gzip/gzfht_test.c
tools/testing/selftests/powerpc/pmu/ebb/Makefile 1 addition, 1 deletion

tools/testing/selftests/powerpc/pmu/ebb/Makefile

with 21 additions and 18 deletions

Loading

0% Loading 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