Merge branch 'x86/urgent' into x86/sgx, to resolve conflict (5c16f7ee) · Commits · CodeLinaro / la / kernel / msm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

msm
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

5c16f7ee

Commit 5c16f7ee authored 3 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'x86/urgent' into x86/sgx, to resolve conflict


Conflicts:
	arch/x86/kernel/cpu/sgx/main.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 379e4de9 ac5d272a

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/kernel/cpu/sgx/main.c 6 additions, 6 deletions

arch/x86/kernel/cpu/sgx/main.c
arch/x86/kernel/setup.c 39 additions, 27 deletions

arch/x86/kernel/setup.c

with 45 additions and 33 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