Linus Torvalds
a40a1d3d0a
VFIO for v3.6 ...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQF+koAAoJECObm247sIsiNjQP/Rra8MHYEtUYlIDlx/MU5aPV
dVOQ1rbHqLH6vnqBESuzwWYd1Eg9pI0yjMoQKuOrxg0Ri/cAhf3WE8xTzb/HTZ6h
npBvVmYIrqAFvE8Tqd0L9XZXNES5dy47F7a3Sp7vXAflQTQ7NAgG3idhzcmom5Zp
6Z7ETrtcaLnu0wr67eb96ICpq9QgPd9rWy5Fn9RAo7NzOb3SJp9CXT02vShytQLk
4sCcez4DTXf3IQjvjgVwV1OfvmcvG1lhI8R1Wvj1TqfqJVC0ZmKQYpmR9rlnPkLB
SB51h0v6a64YaKBpD7R7wuKUGWn2CEg4zAPuFxeACZ99pyx+eulPqZOTX2mAl+gQ
aW5Ec7Au76zvqnKgPVt2nzFMCXYZpHlWRQHqQNon5xXVdqJRS4cJAev7o9udyD6q
SQZIKBoZrwQtA3YbukXd91JKnxliH23MxCaL2u5C5ix6BSKsRs7djHboe210GAcQ
bEjQnhHujETJcFzm1O9HbypJhfg3Klw5o/SKYi3pylURDRMmKVhR3vP9cxdloxAC
QGh3klwQncKN9RxSACsfcNAh0V7RqkufcLXPpEcCwAuyUIrYniwWxiroco/bYE24
DK8g6bi+cY9At2iMALTd2J7RzZcrertQVmRtmXaOrLwSZvWrdizc6qNBpwTIozIT
+V/e1WcSau1C4zU4T0Z0
=fx5A
-----END PGP SIGNATURE-----
Merge tag 'vfio-for-v3.6' of git://github.com/awilliam/linux-vfio
Pull VFIO core from Alex Williamson:
"This series includes the VFIO userspace driver interface for the 3.6
kernel merge window. This driver is intended to provide a secure
interface for device access using IOMMU protection for applications
like assignment of physical devices to virtual machines.
Qemu will be the first user of this interface, enabling assignment of
PCI devices to Qemu guests. This interface is intended to eventually
replace the x86-specific assignment mechanism currently available in
KVM.
This interface has the advantage of being more secure, by working with
IOMMU groups to ensure device isolation and providing it's own
filtered resource access mechanism, and also more flexible, in not
being x86 or KVM specific (extensions to enable POWER are already
working).
This driver is originally the work of Tom Lyon, but has since been
handed over to me and gone through a complete overhaul thanks to the
input from David Gibson, Ben Herrenschmidt, Chris Wright, Joerg
Roedel, and others. This driver has been available in linux-next for
the last month."
Paul Mackerras says:
"I would be glad to see it go in since we want to use it with KVM on
PowerPC. If possible we'd like the PowerPC bits for it to go in as
well."
* tag 'vfio-for-v3.6' of git://github.com/awilliam/linux-vfio:
vfio: Add PCI device driver
vfio: Type1 IOMMU implementation
vfio: Add documentation
vfio: VFIO core
2012-07-31 19:17:27 -07:00
spi/pl022: cleanup pl022 header documentation
2012-07-02 13:55:36 +02:00
bcma: cc: update defines
2012-07-17 15:11:37 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: clean up con flags
2012-07-30 18:16:01 -07:00
libceph: support crush tunables
2012-07-30 18:15:23 -07:00
extcon: spelling of detach in function doc
2012-07-17 09:32:14 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
IIO channel type and modifiers for CCT and RGBC data
2012-07-10 18:49:26 +01:00
Input: add driver for FT5x06 based EDT displays
2012-07-24 23:55:03 -07:00
LockD: pass actual network namespace to grace period management functions
2012-07-27 16:49:22 -04:00
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
netfilter: nfnetlink_queue: do not allow to set unsupported flag bits
2012-07-04 19:51:50 +02:00
pinctrl: add pinctrl_add_gpio_ranges function
2012-07-03 21:51:08 +02:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-07-26 12:59:53 -07:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2012-07-31 14:42:28 -07:00
USB patches for 3.6-rc1
2012-07-26 10:23:47 -07:00
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
libata: detect Device Attention support
2012-06-29 11:38:17 -04:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
net: em_canid: Ematch rule to match CAN frames according to their identifiers
2012-07-04 13:07:05 +02:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
clk: Add CLK_IS_BASIC flag to identify basic clocks
2012-07-11 15:36:43 -07:00
clk: add DT fixed-clock binding support
2012-07-11 17:58:46 -07:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
2012-07-30 17:25:21 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
workqueue: perform cpu down operations from low priority cpu_notifier()
2012-07-17 12:39:26 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
cpusets, hotplug: Restructure functions that are invoked during hotplug
2012-07-24 13:53:22 +02:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
dmaengine: Add wrapper for device_tx_status callback
2012-06-20 15:38:27 +01:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
edac: allow specifying the error count with fake_inject
2012-06-27 09:01:30 -03:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
net: added support for 40GbE link.
2012-06-27 15:42:24 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2012-07-31 14:42:28 -07:00
tracing: Remove NR_CPUS array from trace_iterator
2012-06-28 13:52:15 -04:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
driver-core: Move kobj_to_dev from genhd.h to device.h
2012-07-16 18:05:45 -07:00
gpio: fix bits conflict for gpio flags
2012-07-05 15:04:10 +02:00
HID: Add suport for the brightness control keys on HP keyboards
2012-07-09 16:23:33 +02:00
highmem: remove the deprecated form of kmap_atomic
2012-07-24 15:27:27 +08:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
i2c: i2c-ocores: support for 16bit and 32bit IO
2012-07-14 13:30:25 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
wireless: 60g protocol constants
2012-07-02 15:11:12 +02:00
net: introduce new priv_flag indicating iface capable of change mac when running
2012-06-30 01:08:00 -07:00
canfd: add new data structures and constants
2012-06-19 21:39:50 +02:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
ipv4: Add interface option to enable routing of 127.0.0.0/8
2012-06-12 15:25:46 -07:00
init: add comments to keep initcall-names in sync with initcall levels
2012-07-27 09:29:42 +09:30
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-26 13:08:01 -07:00
Pull input changes from Henrik Rydberg, including large update to
2012-07-07 16:18:33 -07:00
random: final removal of IRQF_SAMPLE_RANDOM
2012-07-19 10:40:42 -04:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
jump label: Remove static_branch()
2012-07-06 10:53:49 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
key: Remove extraneous parentheses from rcu_assign_keypointer()
2012-07-02 12:34:23 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
2012-07-22 10:15:28 -07:00
KVM updates for the 3.6 merge window
2012-07-24 12:01:20 -07:00
leds: Rename led_brightness_set() to led_set_brightness()
2012-07-24 07:52:34 +08:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
slab/mempolicy: always use local policy from interrupt context
2012-06-20 10:01:04 +03:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
x86/mce: Fix siginfo_t->si_addr value for non-recoverable memory faults
2012-07-11 10:20:47 -07:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-07-30 11:32:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
USB: properly pad out usb_device_id.driver_info
2012-06-18 15:38:22 -07:00
video: mxsfb: move mxsfb.h into include/linux
2012-07-03 13:22:37 +08:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: honour netif_set_real_num_tx_queues() retval
2012-07-20 11:06:59 -07:00
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
2012-06-22 02:49:52 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netlink: add nlk->netlink_bind hook for module auto-loading
2012-06-29 16:46:06 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Cleanup - only store the write verifier in struct nfs_page
2012-06-28 17:20:50 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
2012-07-30 09:22:37 -07:00
iommu: Add DMA window parser, of_get_dma_window()
2012-06-25 13:50:28 +02:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
Viresh has moved
2012-06-20 14:39:36 -07:00
PCI/ACPI: provide MMCONFIG address for PCI host bridges
2012-06-22 15:16:51 -06:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
perf: Introduce perf_pmu_migrate_context()
2012-06-18 12:13:21 +02:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
pipe: remove KM_USER0 from comments
2012-07-24 15:27:34 +08:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
PM / Domains: Add device domain data reference counter
2012-07-05 22:12:32 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
2012-07-13 20:41:58 -07:00
security: Minor improvements to no_new_privs documentation
2012-07-08 00:25:48 +10:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
pstore: Headers should include all stuff they use
2012-07-17 12:15:30 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
pwm: Add device tree support
2012-06-15 12:56:57 +02:00
pwm-backlight: Add rudimentary device tree support
2012-07-23 13:23:52 +02:00
ASoC: fix pxa-ssp compiling issue under mach-mmp
2012-06-11 12:26:15 +08:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"
2012-07-02 11:39:19 -07:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
remoteproc: Support custom firmware handlers
2012-07-15 11:39:01 +03:00
rpmsg: make sure inflight messages don't invoke just-removed callbacks
2012-07-04 11:51:59 +03:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
NMI watchdog: fix for lockup detector breakage on resume
2012-07-30 17:25:13 -07:00
seq_file: Add seq_vprintf function and export it
2012-06-11 13:16:35 +01:00
serial/8250: Add LPC3220 standard UART type
2012-07-26 13:37:02 -07:00
ACPI: mark acpi_sfi_table_parse() as __init
2012-06-22 15:36:44 -06:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
sh: pfc: Rudimentary pinctrl-backed GPIO support.
2012-07-10 12:08:14 +09:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
ARM: 7430/1: sizes.h: move from asm-generic to <linux/sizes.h>
2012-06-28 17:14:34 +01:00
skbuff: add an api to orphan frags
2012-07-22 12:39:33 -07:00
mm, sl[aou]b: Common definition for boot state of the slab allocators
2012-07-09 12:13:35 +03:00
slab: rename gfpflags to allocflags
2012-07-02 13:40:06 +03:00
mm, sl[aou]b: Extract common fields from struct kmem_cache
2012-06-14 09:20:16 +03:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
PM / Sleep: Separate printing suspend times from initcall_debug
2012-07-01 13:31:23 +02:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
ipv4: Don't add deprecated new binary sysctl value.
2012-06-22 23:02:22 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
nohz: Rename ts->idle_tick to ts->last_tick
2012-06-11 20:07:17 +02:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
tracepoint: Use static_key_false(), since static_branch() is deprecated
2012-07-06 10:53:49 +02:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
HID: uhid: implement feature requests
2012-06-18 13:42:03 +02:00
USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
2012-07-16 17:43:04 -07:00
[SCSI] usb-storage: add support for write cache quirk
2012-07-20 08:59:00 +01:00
usbdevfs: Use scatter-gather lists for large bulk transfers
2012-07-06 10:53:20 -07:00
[media] uvcvideo: Document the struct uvc_xu_control_query query field
2012-07-06 15:26:45 -03:00
[media] v4l: Unify selection flags
2012-07-06 20:17:46 -03:00
[media] v4l: Unify selection flags
2012-07-06 20:17:46 -03:00
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[media] v4l2: Add rangelow and rangehigh fields to the v4l2_hw_freq_seek struct
2012-07-30 20:23:11 -03:00
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
