| commit | a4e91d04b86504f145cc5f766c2609357a68b186 | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Thu May 15 14:46:57 2014 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Thu May 15 14:46:57 2014 +0200 |
| tree | 4578a55a253be7245ea294b68a07c82da820dfa4 | |
| parent | 16a9602158861687c78b6de6dc6a79e6e8a9136f [diff] | |
| parent | ebc3226202d5956a5963185222982d435378b899 [diff] |
Merge tag 'kvm-s390-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master Here is a fix that aligns the irqfd code changes for 3.15 with the right capability number. irqfd for s390x was introduced with 3.15-rc1, so this fix should still go into Linus tree for 3.15