projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5405c92
d6bd819
)
Merge branch 'fixes' into next
author
Michael Ellerman
<mpe@ellerman.id.au>
Mon, 3 Jul 2017 13:05:43 +0000
(23:05 +1000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Mon, 3 Jul 2017 13:05:43 +0000
(23:05 +1000)
Merge our fixes branch, a few of them are tripping people up while
working on top of next, and we also have a dependency between the CXL
fixes and new CXL code we want to merge into next.
1
2
arch/powerpc/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/processor.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/exceptions-64s.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/process.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/setup-common.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/mm/mmu_context_book3s64.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/perf/power9-pmu.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/platforms/powernv/subcore.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/platforms/pseries/hotplug-memory.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/sysdev/xive/common.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/Kconfig
Simple merge
diff --cc
arch/powerpc/include/asm/processor.h
Simple merge
diff --cc
arch/powerpc/kernel/exceptions-64s.S
Simple merge
diff --cc
arch/powerpc/kernel/process.c
Simple merge
diff --cc
arch/powerpc/kernel/setup-common.c
Simple merge
diff --cc
arch/powerpc/mm/mmu_context_book3s64.c
Simple merge
diff --cc
arch/powerpc/perf/power9-pmu.c
Simple merge
diff --cc
arch/powerpc/platforms/powernv/subcore.c
Simple merge
diff --cc
arch/powerpc/platforms/pseries/hotplug-memory.c
Simple merge
diff --cc
arch/powerpc/sysdev/xive/common.c
Simple merge