Linus Torvalds
ae7a835cc5
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm ...
Pull KVM updates from Gleb Natapov:
"The highlights of the release are nested EPT and pv-ticketlocks
support (hypervisor part, guest part, which is most of the code, goes
through tip tree). Apart of that there are many fixes for all arches"
Fix up semantic conflicts as discussed in the pull request thread..
* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
ARM: KVM: Add newlines to panic strings
ARM: KVM: Work around older compiler bug
ARM: KVM: Simplify tracepoint text
ARM: KVM: Fix kvm_set_pte assignment
ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
ARM: KVM: vgic: fix GICD_ICFGRn access
ARM: KVM: vgic: simplify vgic_get_target_reg
KVM: MMU: remove unused parameter
KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
KVM: PPC: Book3S: Fix compile error in XICS emulation
KVM: PPC: Book3S PR: return appropriate error when allocation fails
arch: powerpc: kvm: add signed type cast for comparation
KVM: x86: add comments where MMIO does not return to the emulator
KVM: vmx: count exits to userspace during invalid guest emulation
KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
kvm: optimize away THP checks in kvm_is_mmio_pfn()
...
2013-09-04 18:15:06 -07:00
dmaengine: PL08x: Avoid collisions with get_signal() macro
2013-07-05 11:40:47 +05:30
libceph: fix invalid unsigned->signed conversion for timespec encoding
2013-07-09 12:18:06 -07:00
The common clock framework changes for 3.11 include new clock drivers
2013-07-03 11:54:50 -07:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
extcon: Add an API to get extcon device from dt node
2013-08-05 08:52:45 +09:00
iio: trigger: implement devm_iio_trigger_alloc/devm_iio_triger_free
2013-08-17 19:34:52 +01:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
sound updates for 3.12-rc1
2013-09-04 16:26:56 -07:00
net/mlx4_core: Add HW enforcement to VF link state
2013-07-01 13:10:57 -07:00
net/mlx5_core: Support MANAGE_PAGES and QUERY_PAGES firmware command changes
2013-08-15 15:42:57 -07:00
mmc: esdhc: Fix bug when writing to SDHCI_HOST_CONTROL register
2013-07-05 12:48:35 -04:00
pinctrl: Pass all configs to driver on pin_config_set()
2013-08-28 13:34:41 +02:00
sound updates for 3.12-rc1
2013-09-04 16:26:56 -07:00
Merge remote-tracking branch 'regulator/topic/ramp' into regulator-next
2013-09-01 13:50:20 +01:00
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
2013-09-01 13:49:06 +01:00
SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister
2013-08-07 17:07:18 -04:00
Char/Misc patches for 3.12-rc1
2013-09-03 11:36:27 -07:00
ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path
2013-07-31 14:20:39 +02:00
PCI changes for the v3.11 merge window:
2013-07-03 16:31:35 -07:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
libata: Add support for SEND/RECEIVE FPDMA QUEUED
2013-08-25 09:39:12 -04:00
ARM: atmel-ssc: change phybase type to dma_addr_t
2013-07-15 11:07:56 +01:00
serial: at91: distinguish usart and uart
2013-07-29 13:04:12 -07:00
audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
2013-07-09 10:33:19 -07:00
backlight: add devm_backlight_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
xtensa: remove the second argument of __bio_kmap_atomic()
2013-07-08 01:23:15 -07:00
mm: kill free_all_bootmem_node()
2013-07-03 16:07:39 -07:00
mm: vmscan: take page buffers dirty and locked state into account
2013-07-03 16:07:29 -07:00
cgroup: implement CFTYPE_NO_PREFIX
2013-08-26 18:40:56 -04:00
cgroup: remove bcache_subsys_id which got added stealthily
2013-07-09 16:30:35 -07:00
clocksource: Reselect clocksource when watchdog validated high-res capability
2013-07-05 11:09:28 +02:00
Introduce [compat_]save_altstack_ex() to unbreak x86 SMAP
2013-09-01 14:16:33 -07:00
vtime: Optimize full dynticks accounting off case with static keys
2013-08-14 17:14:54 +02:00
context_tracking: Split low level state headers
2013-08-14 17:14:51 +02:00
Merge branch 'pm-cpufreq'
2013-08-27 01:44:40 +02:00
thermal: cpu_cooling: fix stub function
2013-07-08 10:13:40 -04:00
cpufreq: Drop the owner field from struct cpufreq_driver
2013-08-10 03:24:47 +02:00
cpuidle: Add missing forward declarations of structures
2013-07-15 02:09:47 +02:00
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
2013-07-24 17:04:16 +10:00
vfs: reimplement d_rcu_to_refcount() using lockref_get_or_lock()
2013-09-02 11:38:06 -07:00
debugfs: provide debugfs_create_x64() when disabled
2013-08-27 22:09:12 -07:00
debugobjects: Make debug_object_activate() return status
2013-08-18 17:39:55 -07:00
dm: optimize use SRCU and RCU
2013-07-10 23:41:18 +01:00
ACPI and power management updates for 3.12-rc1
2013-09-03 15:59:39 -07:00
mm/cma: Move dma contiguous changes into a seperate config
2013-07-02 10:08:22 +02:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
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
EDAC: Fix lockdep splat
2013-07-23 16:01:28 -07:00
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
elevator: Fix a race in elevator switching
2013-07-03 13:25:24 +02:00
PTR_RET is now PTR_ERR_OR_ZERO
2013-07-15 11:25:00 +09:30
firewire: fix libdc1394/FlyCap2 iso event regression
2013-07-27 20:24:36 +02:00
quota: provide interface for readding allocated space into reserved space
2013-08-17 09:32:32 -04:00
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
2013-09-03 07:41:11 +02:00
include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
2013-07-09 10:33:21 -07:00
hardirq: Split preempt count mask definitions
2013-08-14 17:14:52 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
mm/hugetlb: remove hugetlb_prefault
2013-07-03 16:07:32 -07:00
Drivers: hv: remove HV_DRV_VERSION
2013-08-02 11:34:30 +08:00
vlan: mask vlan prio bits
2013-07-18 13:05:23 -07:00
ipv4: expose IPV4_DEVCONF
2013-08-22 20:30:15 -07:00
ipv6: drop packets with multiple fragmentation headers
2013-08-20 00:11:24 -07:00
jbd2: invalidate handle if jbd2_journal_restart() fails
2013-07-01 08:12:41 -04:00
jiffies: Avoid undefined behavior from signed overflow
2013-08-20 11:46:54 -07:00
jump_label: Split jumplabel ratelimit
2013-08-09 07:53:54 -07:00
jump_label: Split jumplabel ratelimit
2013-08-09 07:53:54 -07:00
tty: Remove dead code
2013-07-26 16:19:48 -07:00
tracing: Fix trace_dump_stack() proto when CONFIG_TRACING is not set
2013-08-02 22:38:10 -04:00
kobject: delayed kobject release: help find buggy drivers
2013-07-25 15:39:04 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
KVM: s390: Make KVM_HVA_ERR_BAD usable on s390
2013-07-29 09:03:53 +02:00
lcd: add devm_lcd_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
libata: Add support for queued DSM TRIM
2013-08-25 09:39:12 -04:00
linked-list: Remove __list_for_each
2013-07-16 22:00:14 -07:00
tty: Use lockless flip buffer free list
2013-07-23 16:47:08 -07:00
lockdep: Introduce lock_acquire_exclusive()/shared() helper macros
2013-07-12 13:51:18 +02:00
lockref: implement lockless reference count updates using cmpxchg()
2013-09-02 12:12:15 -07:00
lib: add lz4 compressor module
2013-07-09 10:33:30 -07:00
cgroup: pass around cgroup_subsys_state instead of cgroup in file methods
2013-08-08 20:11:24 -04:00
drivers: base: use standard device online/offline for state change
2013-08-21 11:52:20 -07:00
Merge branch 'x86/mce' into x86/ras
2013-08-12 17:54:05 +02:00
x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member
2013-08-22 10:19:35 -07:00
mm: tune vm_committed_as percpu_counter batching size
2013-07-03 16:07:32 -07:00
mm: remove unused functions is_{normal_idx, normal, dma32, dma}
2013-07-09 10:33:22 -07:00
ssb: fix alignment of struct bcma_device_id
2013-07-18 16:21:59 -04:00
module: Fix mod->mkobj.kobj potentially freed too early
2013-09-03 16:35:47 +09:30
module: Add flag to allow mod params to have no arguments
2013-08-20 15:37:42 +09:30
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
nbd: correct disconnect behavior
2013-07-03 16:08:05 -07:00
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
2013-08-01 15:11:17 -07:00
NFS: Make nfs_attribute_cache_expired() non-static
2013-07-09 17:17:07 -04:00
numa: Mark __node_set() as __always_inline
2013-07-25 21:54:01 +02:00
Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children
2013-08-27 13:52:52 -04:00
ACPI and power management updates for 3.12-rc1
2013-09-03 15:59:39 -07:00
of/device: add helper to get cpu device node from logical cpu index
2013-08-21 10:29:51 +01:00
Staging: olpc_dcon: replace some magic numbers
2013-08-15 17:22:27 -07:00
mm/pageblock: remove get/set_pageblock_flags
2013-07-03 16:07:32 -07:00
mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
2013-07-03 16:07:31 -07:00
ACPI / PCI: Make bus registration and unregistration symmetric
2013-07-23 03:58:42 +02:00
Merge branch 'pci/misc' into next
2013-08-28 20:55:41 -06:00
PCI: Add hotplug_slot_ops.reset_slot()
2013-08-14 14:55:04 -06:00
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-09-04 11:07:04 -07:00
percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays
2013-08-23 16:08:27 -04:00
Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-09-04 11:55:10 -07:00
kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
2013-07-03 16:08:03 -07:00
Device tree updates for v3.11
2013-07-04 15:51:45 -07:00
PM / Sleep: Fix comment typo in pm_wakeup.h
2013-07-15 01:31:37 +02:00
posix_cpu_timer: consolidate expiry time type
2013-07-03 16:16:20 +02:00
PPS: convert class code to use dev_groups
2013-08-19 21:22:34 -07:00
hardirq: Split preempt count mask definitions
2013-08-14 17:14:52 +02:00
x86, asmlinkage: Make dump_stack visible
2013-08-06 14:21:01 -07:00
pstore: Introduce new argument 'compressed' in the read callback
2013-08-19 10:18:11 -07:00
ptrace: revert "Prepare to fix racy accesses on task breakpoints"
2013-07-09 10:33:26 -07:00
ARM: pxa: ssp: add pxa_ssp_request_of()
2013-08-14 19:54:30 +01:00
quota: provide interface for readding allocated space into reserved space
2013-08-17 09:32:32 -04:00
rculist: list_first_or_null_rcu() should use list_entry_rcu()
2013-08-18 17:40:16 -07:00
nohz_full: Add full-system-idle state machine
2013-08-31 14:43:50 -07:00
reboot: move arch/x86 reboot= handling to generic kernel
2013-07-09 10:33:29 -07:00
regmap: Updates for v3.12
2013-09-03 10:07:40 -07:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
rapidio: change endpoint device name format
2013-07-03 16:08:05 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-09-04 18:15:06 -07:00
NFS client updates for Linux 3.11
2013-07-09 12:09:43 -07:00
ipc/sem.c: replace shared sem_otime with per-semaphore value
2013-07-09 10:33:28 -07:00
seq_file: add seq_list_*_percpu helpers
2013-07-08 13:36:41 +04:00
DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
2013-07-05 11:40:59 +05:30
dmaengine: shdma: fix a build failure on platforms with no DMA support
2013-07-22 19:40:01 -07:00
Introduce [compat_]save_altstack_ex() to unbreak x86 SMAP
2013-09-01 14:16:33 -07:00
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
2013-08-01 15:11:17 -07:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
include/linux/smp.h:on_each_cpu(): switch back to a macro
2013-07-03 16:07:22 -07:00
sched: fix the theoretical signal_wake_up() vs schedule() race
2013-08-13 08:19:26 -07:00
dt:net:stmmac: Add dt specific phy reset callback support.
2013-07-04 14:34:17 -07:00
swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
2013-07-03 16:07:32 -07:00
mm: save soft-dirty bits on swapped pages
2013-08-13 17:57:47 -07:00
microblaze: fix clone syscall
2013-08-13 17:57:48 -07:00
sysfs: sysfs_create_groups returns a value.
2013-08-28 09:51:41 -07:00
Merge branch 'timers/nohz-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
2013-08-14 17:58:56 +02:00
tty: Fix lock order in tty_do_resize()
2013-07-24 15:12:53 -07:00
tty: Fix unsafe vt paste_selection()
2013-07-23 16:47:10 -07:00
tty: Make ldisc input flow control concurrency-friendly
2013-07-23 16:42:59 -07:00
USB: introduce usb_device_no_sg_constraint() helper
2013-08-12 11:56:16 -07:00
userns: limit the maximum depth of user_namespace->parent chain
2013-08-08 13:11:39 -07:00
reboot: arm: change reboot_mode to use enum reboot_mode
2013-07-09 10:33:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
virtio: include asm/barrier explicitly
2013-07-09 10:47:53 +09:30
mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
2013-07-09 10:33:21 -07:00
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-09-03 18:25:03 -07:00
vtime: Optimize full dynticks accounting off case with static keys
2013-08-14 17:14:54 +02:00
[SCSI] zfcp: fix lock imbalance by reworking request queue locking
2013-08-22 08:53:30 -07:00
workqueue: mark WQ_NON_REENTRANT deprecated
2013-07-30 08:30:16 -04:00
mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name
2013-07-09 10:33:22 -07:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
zbud: add to mm/
2013-07-10 18:11:34 -07:00
