summaryrefslogtreecommitdiff
path: root/scripts/cleanpatch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@ozlabs.org>2019-08-23 07:08:04 +0300
committerPaul Mackerras <paulus@ozlabs.org>2019-08-23 07:08:04 +0300
commit75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 (patch)
tree1817fd08e5cf8a65e7958711c4e8b15554b4d5a2 /scripts/cleanpatch
parent3bda7f0ae0f786b202c0c5124c208be067acca30 (diff)
parentda15c03b047dca891d37b9f4ef9ca14d84a6484f (diff)
downloadlinux-75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37.tar.xz
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in fixes for the XIVE interrupt controller which touch both generic powerpc and PPC KVM code. To avoid merge conflicts, these commits will go upstream via the powerpc tree as well as the KVM tree. Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'scripts/cleanpatch')
0 files changed, 0 insertions, 0 deletions