diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-02 23:02:35 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-02 23:02:35 +1000 |
| commit | b66081e25e2865464e3101bcc4a071bcc4e47dbb (patch) | |
| tree | ee65c06835d71f587b213768d3cc5308a006a510 /arch/powerpc/kvm/book3s_64_vio.c | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
| parent | 71d29f43b6332badc5598c656616a62575e83342 (diff) | |
Merge branch 'kvm-ppc-fixes' of paulus/powerpc into topic/ppc-kvm
Some commits we'd like to share between the powerpc and kvm-ppc tree for
next have dependencies on commits that went into 4.19 via the
kvm-ppc-fixes branch and weren't merged before 4.19-rc3, which is our
base commit.
So merge the kvm-ppc-fixes branch into topic/ppc-kvm.
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_vio.c')
0 files changed, 0 insertions, 0 deletions