Merge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)
  KVM: PPC: Whitespace fix for kvm.h
  KVM: Fix whitespace in kvm_para.h
  KVM: PPC: annotate kvm_rma_init as __init
  KVM: x86 emulator: implement RDPMC (0F 33)
  KVM: x86 emulator: fix RDPMC privilege check
  KVM: Expose the architectural performance monitoring CPUID leaf
  KVM: VMX: Intercept RDPMC
  KVM: SVM: Intercept RDPMC
  KVM: Add generic RDPMC support
  KVM: Expose a version 2 architectural PMU to a guests
  KVM: Expose kvm_lapic_local_deliver()
  KVM: x86 emulator: Use opcode::execute for Group 9 instruction
  KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions
  KVM: x86 emulator: Use opcode::execute for Group 1A instruction
  KVM: ensure that debugfs entries have been created
  KVM: drop bsp_vcpu pointer from kvm struct
  KVM: x86: Consolidate PIT legacy test
  KVM: x86: Do not rely on implicit inclusions
  KVM: Make KVM_INTEL depend on CPU_SUP_INTEL
  KVM: Use memdup_user instead of kmalloc/copy_from_user
  ...

diff --combined Documentation/feature-removal-schedule.txt
index 284b442,165019d..5575759
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -85,6 -85,17 +85,6 @@@ Who: Robin Getz <rgetz@blackfin.uclinux
  
  ---------------------------
  
 -What: Deprecated snapshot ioctls
 -When: 2.6.36
 -
 -Why:  The ioctls in kernel/power/user.c were marked as deprecated long time
 -      ago. Now they notify users about that so that they need to replace
 -      their userspace. After some more time, remove them completely.
 -
 -Who:  Jiri Slaby <jirislaby@gmail.com>
 -
 ----------------------------
 -
  What: The ieee80211_regdom module parameter
  When: March 2010 / desktop catchup
  
@@@ -252,7 -263,8 +252,7 @@@ Who:       Ravikiran Thirumalai <kiran@scalex
  
  What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
        (in net/core/net-sysfs.c)
 -When: After the only user (hal) has seen a release with the patches
 -      for enough time, probably some time in 2010.
 +When: 3.5
  Why:  Over 1K .text/.data size reduction, data is available in other
        ways (ioctls)
  Who:  Johannes Berg <johannes@sipsolutions.net>
@@@ -350,15 -362,6 +350,6 @@@ Who:      anybody or Florian Mickler <flori
  
  ----------------------------
  
- What: KVM paravirt mmu host support
- When: January 2011
- Why:  The paravirt mmu host support is slower than non-paravirt mmu, both
-       on newer and older hardware.  It is already not exposed to the guest,
-       and kept only for live migration purposes.
- Who:  Avi Kivity <avi@redhat.com>
- 
- ----------------------------
- 
  What: iwlwifi 50XX module parameters
  When: 3.0
  Why:  The "..50" modules parameters were used to configure 5000 series and
@@@ -523,20 -526,6 +514,20 @@@ Why:    In 3.0, we can now autodetect i
        information log when acer-wmi initial.
  Who:    Lee, Chun-Yi <jlee@novell.com>
  
 +---------------------------
 +
 +What: /sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and
 +      is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.
 +When: 3.8
 +Why:  The is_dualspeed file is superseded by maximum_speed in the same
 +      directory and is_dualspeed line in device file is superseded by
 +      max_speed line in the same file.
 +
 +      The maximum_speed/max_speed specifies maximum speed supported by UDC.
 +      To check if dualspeeed is supported, check if the value is >= 3.
 +      Various possible speeds are defined in <linux/usb/ch9.h>.
 +Who:  Michal Nazarewicz <mina86@mina86.com>
 +
  ----------------------------
  
  What: The XFS nodelaylog mount option

diff --combined Documentation/kernel-parameters.txt
index 7b2e5c5,e35c1ef..e69a461
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1178,9 -1178,6 +1178,6 @@@ bytes respectively. Such letter suffixe
        kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.
                        Default is 0 (don't ignore, but inject #GP)
  
-       kvm.oos_shadow= [KVM] Disable out-of-sync shadow paging.
-                       Default is 1 (enabled)
- 
        kvm.mmu_audit=  [KVM] This is a R/W parameter which allows audit
                        KVM MMU at runtime.
                        Default is 0 (off)
@@@ -1888,8 -1885,6 +1885,8 @@@
                        timer: [X86] Force use of architectural NMI
                                timer mode (see also oprofile.timer
                                for generic hr timer mode)
 +                              [s390] Force legacy basic mode sampling
 +                                (report cpu_type "timer")
  
        oops=panic      Always panic on oopses. Default is to just kill the
                        process, but there is a small probability of
@@@ -2637,10 -2632,6 +2634,10 @@@
                        [USB] Start with the old device initialization
                        scheme (default 0 = off).
  
 +      usbcore.usbfs_memory_mb=
 +                      [USB] Memory limit (in MB) for buffers allocated by
 +                      usbfs (default = 16, 0 = max = 2047).
 +
        usbcore.use_both_schemes=
                        [USB] Try the other device initialization scheme
                        if the first one fails (default 1 = enabled).
@@@ -2759,10 -2750,11 +2756,10 @@@
                        functions are at fixed addresses, they make nice
                        targets for exploits that can control RIP.
  
 -                      emulate     Vsyscalls turn into traps and are emulated
 -                                  reasonably safely.
 +                      emulate     [default] Vsyscalls turn into traps and are
 +                                  emulated reasonably safely.
  
 -                      native      [default] Vsyscalls are native syscall
 -                                  instructions.
 +                      native      Vsyscalls are native syscall instructions.
                                    This is a little bit faster than trapping
                                    and makes a few dynamic recompilers work
                                    better than they would in emulation mode.