projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77fad8b
7ecb37f
)
Merge branch 'fixes' into next
author
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 10 Nov 2017 09:55:03 +0000
(20:55 +1100)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 10 Nov 2017 09:55:03 +0000
(20:55 +1100)
We have some dependencies & conflicts between patches in fixes and
things to go in next, both in the radix TLB flush code and the IMC PMU
driver. So merge fixes into next.
1
2
arch/powerpc/kernel/dt_cpu_ftrs.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/kprobes.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/mce_power.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/setup-common.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/trace/ftrace_64_mprofile.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/lib/sstep.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/mm/numa.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/platforms/powernv/setup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/kernel/dt_cpu_ftrs.c
Simple merge
diff --cc
arch/powerpc/kernel/kprobes.c
Simple merge
diff --cc
arch/powerpc/kernel/mce_power.c
Simple merge
diff --cc
arch/powerpc/kernel/setup-common.c
Simple merge
diff --cc
arch/powerpc/kernel/trace/ftrace_64_mprofile.S
Simple merge
diff --cc
arch/powerpc/lib/sstep.c
Simple merge
diff --cc
arch/powerpc/mm/numa.c
Simple merge
diff --cc
arch/powerpc/platforms/powernv/setup.c
Simple merge