mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b779157dd3db6199b50e7ad64678a1ceedbeebcf
linux/drivers
History
Linus Torvalds b779157dd3 Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio 
Pull VFIO updates from Alex Williamson:

 - fix race with device reference versus driver release (Alex Williamson)

 - add reset hooks and Calxeda xgmac reset for vfio-platform (Eric Auger)

 - enable vfio-platform for ARM64 (Eric Auger)

 - tag Baptiste Reynal as vfio-platform sub-maintainer (Alex Williamson)

* tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio:
  MAINTAINERS: Add vfio-platform sub-maintainer
  VFIO: platform: enable ARM64 build
  VFIO: platform: Calxeda xgmac reset module
  VFIO: platform: populate the reset function on probe
  VFIO: platform: add reset callback
  VFIO: platform: add reset struct and lookup table
  vfio/pci: Fix racy vfio_device_get_from_dev() call
2015-06-28 12:32:13 -07:00
..
accessibility
…
acpi
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-06-25 17:51:55 -07:00
amba
…
android
…
ata
Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:08:27 -07:00
atm
…
auxdisplay
…
base
Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2015-06-26 15:07:37 -07:00
bcma
…
block
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
bluetooth
Bluetooth: ath3k: Add support of 04ca:300d AR3012 device
2015-06-18 21:00:06 +03:00
bus
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:54:29 -07:00
cdrom
…
char
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
clk
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
clocksource
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-06-26 12:20:00 -07:00
connector
…
cpufreq
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
cpuidle
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-06-26 12:20:00 -07:00
crypto
Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2015-06-23 14:18:07 -07:00
dca
…
devfreq
…
dio
…
dma
Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2015-06-26 15:53:22 -07:00
dma-buf
…
edac
Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2015-06-26 15:07:37 -07:00
eisa
…
extcon
extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
2015-06-12 17:01:42 -07:00
firewire
…
firmware
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
fmc
…
gpio
Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2015-06-24 19:21:02 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-06-26 13:18:51 -07:00
hid
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus
2015-06-22 16:23:43 +02:00
hsi
HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction
2015-06-23 02:40:03 +02:00
hv
Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
2015-06-12 16:58:33 -07:00
hwmon
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
hwspinlock
…
hwtracing/coresight
…
i2c
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
ide
Merge branch 'for-4.2/core' of git://git.kernel.dk/linux-block
2015-06-25 14:29:53 -07:00
idle
…
iio
…
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
input
Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2015-06-26 15:53:22 -07:00
iommu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-06-26 13:18:51 -07:00
ipack
…
irqchip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
leds
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:54:29 -07:00
lguest
Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-22 17:59:09 -07:00
macintosh
macintosh/nvram: Remove as unused
2015-06-15 16:42:37 +10:00
mailbox
mailbox/bcm2835: Fix mailbox full detection.
2015-06-13 16:20:39 +05:30
mcb
…
md
Merge tag 'dm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2015-06-26 12:35:01 -07:00
media
Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2015-06-26 15:46:08 -07:00
memory
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:54:29 -07:00
memstick
…
message
fusion: remove dead MTRR code
2015-06-13 08:44:14 -07:00
mfd
Merge tag 'rtc-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2015-06-25 18:55:33 -07:00
misc
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
mmc
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
2015-06-25 15:22:36 -07:00
mtd
Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block
2015-06-25 16:00:17 -07:00
net
netconsole: implement extended console support
2015-06-25 17:00:39 -07:00
nfc
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
ntb
Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2015-06-23 13:41:24 -07:00
nubus
…
of
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-06-26 13:18:51 -07:00
oprofile
…
parisc
…
parport
parport: check exclusive access before register
2015-06-12 16:58:33 -07:00
pci
Mohit Kumar has moved
2015-06-25 17:00:38 -07:00
pcmcia
Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-06-26 14:51:15 -07:00
phy
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
pinctrl
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:54:29 -07:00
platform
Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2015-06-26 15:46:08 -07:00
pnp
Merge branches 'pnp' and 'pm-tools'
2015-06-19 01:18:43 +02:00
power
power: axp288_charger: fix for API change
2015-06-26 17:44:09 -07:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2015-06-23 13:32:38 -07:00
rapidio
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-06-23 14:08:54 -07:00
ras
…
regulator
Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2015-06-25 17:15:18 -07:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
s390
Merge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block
2015-06-25 15:12:50 -07:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
sfi
…
sh
…
sn
…
soc
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:54:29 -07:00
spi
Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next
2015-06-18 00:19:56 +01:00
spmi
…
ssb
…
staging
Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2015-06-26 15:46:08 -07:00
target
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
tc
…
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-06-25 17:51:55 -07:00
thunderbolt
…
tty
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
uio
uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
2015-06-12 17:01:43 -07:00
usb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
uwb
…
vfio
Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio
2015-06-28 12:32:13 -07:00
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
video
Merge tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2015-06-26 15:53:22 -07:00
virt
…
virtio
Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2015-06-23 13:41:24 -07:00
vlynq
…
vme
vme: tsi148: depend on HAS_DMA for Kconfig
2015-06-12 17:31:05 -07:00
w1
w1: use correct lock on error in w1_seq_show()
2015-06-12 16:58:33 -07:00
watchdog
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-06-26 11:34:35 -07:00
xen
frontswap: allow multiple backends
2015-06-24 17:49:45 -07:00
zorro
…
Kconfig
…
Makefile
…