]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85eae57 d72e90f)
Merge tag 'v4.18-rc6' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 6 Aug 2018 15:31:36 +0000 (17:31 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 6 Aug 2018 15:31:36 +0000 (17:31 +0200)
Pull bug fixes into the KVM development tree to avoid nasty conflicts.

1  2 
arch/powerpc/kvm/book3s_64_vio.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kvm/book3s_64_vio.c
Simple merge
local clone of linux.git