linux/arch
Paolo Bonzini a4e91d04b8 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdIGJAAoJEBF7vIC1phx8ZQcP/12UGVrugSXHnxXZCp0VVRLd
 Fz0Mk180jkWPiU8TiyX2KsgjP578C/gKKty9230iqzPBNJzO2jdqLOBBH/YlSJbo
 hLi1/ZsE8pSxDqSS1rk9WUE0Q862sl08eDYV48s+61B8TlmxO9aXepySgJLH1QaQ
 0rom1tr9QJsUhdHOoSu3Onbtx/uYp2QTCFiL5n1TZwl7XXHrosgxDJiNJibX2HNW
 MS2ydN1GcKMlDx2FibiG6sWoVWoddOTvfYb6hdHMONX8UJGRqMniS9Q8tatAFQsm
 l4qgKnbR6EE+2d9zn8npLH0VFcmbE93jXJaRXFikeLESOqRyUnjZh+bzqrd67aTL
 J3UEWeEE45+uSdUdgtG60NVz7CGqn+1SRuTirRhDNNMMsAclQ2EgkF3LImcNZpRC
 d0D4Wm1GsgU41I+SEnY+9pMBAl5qOrWjq7qTxxotpbhAlkQjtne+1PvL0OoRX1MQ
 z5P/Yfw0zFFMymMAusakvpV6SVlXQp10HxZhvKrghbPWIhe10CDvasdf+eEMRbZ1
 qXauvOdeS3syooZtc52kswXSE45LKswAnJuD4Ewq60Af5/3+YuBWEJ9OBab8YqkC
 Mc9+87aa5ABR0/8i6nvf7rrAYoaT0YqOOq0AtOssuUkEtnq4oJi7A2W2oMVPtkjm
 2p4iYf5XAQJwuoGbODUO
 =uARM
 -----END PGP SIGNATURE-----

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
2014-05-15 14:46:57 +02:00
..
alpha Merge git://git.infradead.org/users/eparis/audit 2014-04-12 12:38:53 -07:00
arc ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe 2014-04-30 08:21:43 -07:00
arm - Fix for a Haswell regression in nested virtualization, introduced during 2014-05-02 09:26:09 -07:00
arm64 arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent 2014-05-03 22:20:35 +01:00
avr32 Char/Misc driver patches for 3.15-rc1 2014-04-01 16:13:21 -07:00
blackfin blackfin updates for Linux 3.15 2014-04-12 17:26:45 -07:00
c6x Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-03-31 10:59:39 -07:00
cris Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
frv PCI changes for the v3.15 merge window: 2014-04-01 15:14:04 -07:00
hexagon Hexagon: Delete stale barrier.h 2014-05-01 10:09:47 -07:00
ia64 mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts 2014-04-25 16:05:40 -07:00
m32r Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
m68k Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
metag Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
microblaze Microblaze patches for 3.15-rc1 2014-04-11 11:53:45 -07:00
mips Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2014-04-27 11:21:03 -07:00
mn10300 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-04-12 14:49:50 -07:00
openrisc Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
parisc Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 2014-05-01 15:54:44 -07:00
powerpc Patch queue for 3.15 - 2014-05-12 2014-05-13 18:15:16 +02:00
s390 KVM: s390: announce irqfd capability 2014-05-15 10:55:10 +02:00
score score: remove unused CPU_SCORE7 Kconfig parameter 2014-04-03 16:20:52 -07:00
sh mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts 2014-04-25 16:05:40 -07:00
sparc Merge git://git.infradead.org/users/eparis/audit 2014-04-12 12:38:53 -07:00
tile Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
um mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts 2014-04-25 16:05:40 -07:00
unicore32 Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP 2014-04-07 16:36:11 -07:00
x86 KVM: x86: disable master clock if TSC is reset during suspend 2014-05-14 17:59:21 +02:00
xtensa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-04-12 14:49:50 -07:00
.gitignore
Kconfig uprobes: Kconfig dependency fix 2014-03-18 16:39:33 -04:00