iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Linus Torvalds 8d10aae274 vhost: fixes and cleanups 3.11 
This includes some fixes and cleanups for vhost net and scsi drivers.
 The scsi driver changes will cause a conflict with  Nicholas Bellinger's scsi
 target changes, but the conflicting commit in my tree simply renames some
 variables so it's trivial to resolve.
 
 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQEcBAABAgAGBQJR2pQRAAoJECgfDbjSjVRpK1kH/0XfotDzGggmEWIhvjJd6Bur
 GaNbUk/kheNJTc5ecy24tr96mrdOZ0ev8lO8VEXgK1mV6k9YHuqdxH3lvXeNoG1t
 F0IrvDcsYJd0DF8YkX97xnXLz+NL3NUPkGdE9Vbv7r34tdFCGpYw08BpD+uDiRdQ
 DHKnWfLGaRVC/S1wzFeNi8URcMAQdCrQe+76JnPz7Ka6rsCuQYlVtJIQszFaiY7i
 S3Z355dGjI9uDLcUu16PhXMrXRdkMTwR4wQsm8lEKQBaVWXgPQv/EprKGVZcIOCn
 EstDPpYHxyM89AP7sBHiaYIBQMTd37fimBtobztqMk2aqwUBDdBvhx0JUpK+nV8=
 =Qi2H
 -----END PGP SIGNATURE-----

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull vhost fixes and cleanups from Michael S Tsirkin:
 "This includes some fixes and cleanups for vhost net and scsi drivers"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/test: update test after vhost cleanups
  vhost: Make local function static
  vhost: Make vhost a separate module
  vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
  vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
  vhost-scsi: Make func indention more consistent
  vhost-scsi: Rename struct vhost_scsi *s to *vs
  vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
  vhost: Simplify dev->vqs[i] access
  vhost-net: fix use-after-free in vhost_net_flush
2013-07-10 14:48:50 -07:00
..
accessibility
…
acpi
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
amba
…
ata
Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-07-03 19:49:46 -07:00
atm
net, atm/ambassader: convert skb->tail into skb_tail_pointer(skb)
2013-06-17 17:12:20 -07:00
auxdisplay
…
base
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-07-09 16:04:31 -07:00
bcma
bcma: add support for BCM43142
2013-06-27 13:42:16 -04:00
block
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
2013-07-10 10:16:07 -07:00
bluetooth
Bluetooth: Add missing reset_resume dev_pm_ops
2013-06-23 00:23:53 +01:00
bus
ARM SoC device tree changes
2013-07-02 14:23:01 -07:00
cdrom
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
2013-07-03 16:07:25 -07:00
char
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-07-09 16:04:31 -07:00
clk
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
clocksource
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
connector
…
cpufreq
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
cpuidle
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
crypto
crypto: talitos: use sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
dca
…
devfreq
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
dio
…
dma
drivers/dma/iop-adma.c: fix new warnings
2013-07-09 10:33:19 -07:00
edac
Add MCE signatures for family 0x15, models 30-3f.
2013-07-03 13:11:18 -07:00
eisa
…
extcon
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
firewire
firewire: remove support of fw_driver.driver.probe and .remove methods
2013-06-09 18:15:00 +02:00
firmware
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
fmc
FMC: fix error handling in probe() function
2013-06-24 16:23:25 -07:00
gpio
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
gpu
drm: avoid warning in drm_load_edid_firmware()
2013-07-10 14:21:46 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-04 15:35:08 -07:00
hsi
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
hv
drivers: hv: allocate synic structures before hv_synic_init()
2013-06-24 16:24:17 -07:00
hwmon
hwmon: (lm63) Drop redundant safety on cache lifetime
2013-07-08 14:18:24 +02:00
hwspinlock
…
i2c
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-07-04 14:02:09 -07:00
ide
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
idle
…
iio
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
input
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
iommu
IOMMU Updates for Linux 3.11
2013-07-10 14:46:40 -07:00
ipack
…
irqchip
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-02 16:14:35 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
leds
leds: mc13783: Fix "uninitialized variable" warning
2013-07-02 08:44:02 -07:00
lguest
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
macintosh
macintosh/windfarm: Remove obsolete cleanup for clientdata
2013-07-01 11:46:56 +10:00
mailbox
mailbox/omap: move the OMAP mailbox framework to drivers
2013-06-11 11:41:51 -05:00
md
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
media
IEEE 1394 (FireWire) subsystem changes post v3.10:
2013-07-10 11:02:58 -07:00
memory
memory: tegra30-mc: Fix IRQ handler.
2013-06-17 16:46:06 -07:00
memstick
drivers/memstick/host/r592.c: convert to module_pci_driver
2013-07-03 16:08:06 -07:00
message
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
mfd
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
misc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
mmc
MMC highlights for 3.11:
2013-07-10 11:16:00 -07:00
mtd
A couple of fixes and clean-ups, allow for assigning user-defined
2013-07-05 12:09:48 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
ntb
…
nubus
…
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
oprofile
…
parisc
parisc: fix LMMIO mismatch between PAT length and MASK register
2013-07-09 22:09:16 +02:00
parport
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
pci
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
pcmcia
Driver core patches for 3.11-rc1
2013-07-02 11:44:19 -07:00
pinctrl
Pin control changes for the v3.11 kernel cycle:
2013-07-03 11:48:03 -07:00
platform
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
pnp
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
power
Nothing exciting this time, just assorted fixes and cleanups.
2013-07-10 11:13:00 -07:00
pps
pps-gpio: add device-tree binding and support
2013-07-03 16:08:06 -07:00
ps3
…
ptp
build some drivers only when compile-testing
2013-06-24 16:41:32 -07:00
pwm
pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.
2013-06-26 23:23:54 +02:00
rapidio
rapidio: change endpoint device name format
2013-07-03 16:08:05 -07:00
regulator
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
remoteproc
mailbox/omap: move the OMAP mailbox framework to drivers
2013-06-11 11:41:51 -05:00
reset
…
rpmsg
…
rtc
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
sfi
…
sh
Merge branch 'pm-assorted'
2013-06-28 13:01:40 +02:00
sn
…
spi
Merge branch 'akpm' (updates from Andrew Morton)
2013-07-03 17:12:13 -07:00
ssb
ssb/trivial: replace numeric with standard PM state macros
2013-06-28 22:11:48 -07:00
staging
IEEE 1394 (FireWire) subsystem changes post v3.10:
2013-07-10 11:02:58 -07:00
target
iscsi-target: Remove left over v3.10-rc debug printks
2013-06-20 16:47:41 -07:00
tc
…
thermal
thermal: exynos: Support both EXYNOS4X12 SoCs
2013-06-19 01:31:50 +09:00
tty
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-07-04 15:35:08 -07:00
uio
uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
2013-07-03 16:07:26 -07:00
usb
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
uwb
drivers: avoid format string in dev_set_name
2013-07-03 16:07:41 -07:00
vfio
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
vhost
vhost-net: fix use-after-free in vhost_net_flush
2013-07-09 12:55:48 -07:00
video
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-07-09 16:04:31 -07:00
virt
…
virtio
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
vlynq
…
vme
vme: vme_tsi148.c: fix error return code in tsi148_probe()
2013-06-24 16:23:25 -07:00
w1
drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
2013-07-03 16:08:06 -07:00
watchdog
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
xen
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
zorro
zorro: switch to fixed_size_llseek()
2013-06-29 12:57:28 +04:00
Kconfig
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
Makefile
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00