Merge tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kerne...

Pull Xen fixes from Konrad Rzeszutek Wilk:
 "Bug-fixes and one update to the kernel-paramters.txt documentation.

   - Fix PV spinlocks triggering jump_label code bug
   - Remove extraneous code in the tpm front driver
   - Fix ballooning out of pages when non-preemptible
   - Fix deadlock when using a 32-bit initial domain with large amount
     of memory
   - Add xen_nopvpsin parameter to the documentation"

* tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/spinlock: Document the xen_nopvspin parameter.
  xen/p2m: check MFN is in range before using the m2p table
  xen/balloon: don't alloc page while non-preemptible
  xen: Do not enable spinlocks before jump_label_init() has executed
  tpm: xen-tpmfront: Remove the locality sysfs attribute
  tpm: xen-tpmfront: Fix default durations

diff --combined Documentation/kernel-parameters.txt
index 1a036cd972fb0c205109ed66b968c3d771f66418,b9589127b3ee803d8be90124855661415fc0f45a..539a236319907739faded777280b9352a84a284f
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -235,61 -235,10 +235,61 @@@ bytes respectively. Such letter suffixe
                        Format: To spoof as Windows 98: ="Microsoft Windows"
  
        acpi_osi=       [HW,ACPI] Modify list of supported OS interface strings
 -                      acpi_osi="string1"      # add string1 -- only one string
 -                      acpi_osi="!string2"     # remove built-in string2
 +                      acpi_osi="string1"      # add string1
 +                      acpi_osi="!string2"     # remove string2
 +                      acpi_osi=!*             # remove all strings
 +                      acpi_osi=!              # disable all built-in OS vendor
 +                                                strings
                        acpi_osi=               # disable all strings
  
 +                      'acpi_osi=!' can be used in combination with single or
 +                      multiple 'acpi_osi="string1"' to support specific OS
 +                      vendor string(s).  Note that such command can only
 +                      affect the default state of the OS vendor strings, thus
 +                      it cannot affect the default state of the feature group
 +                      strings and the current state of the OS vendor strings,
 +                      specifying it multiple times through kernel command line
 +                      is meaningless.  This command is useful when one do not
 +                      care about the state of the feature group strings which
 +                      should be controlled by the OSPM.
 +                      Examples:
 +                        1. 'acpi_osi=! acpi_osi="Windows 2000"' is equivalent
 +                           to 'acpi_osi="Windows 2000" acpi_osi=!', they all
 +                           can make '_OSI("Windows 2000")' TRUE.
 +
 +                      'acpi_osi=' cannot be used in combination with other
 +                      'acpi_osi=' command lines, the _OSI method will not
 +                      exist in the ACPI namespace.  NOTE that such command can
 +                      only affect the _OSI support state, thus specifying it
 +                      multiple times through kernel command line is also
 +                      meaningless.
 +                      Examples:
 +                        1. 'acpi_osi=' can make 'CondRefOf(_OSI, Local1)'
 +                           FALSE.
 +
 +                      'acpi_osi=!*' can be used in combination with single or
 +                      multiple 'acpi_osi="string1"' to support specific
 +                      string(s).  Note that such command can affect the
 +                      current state of both the OS vendor strings and the
 +                      feature group strings, thus specifying it multiple times
 +                      through kernel command line is meaningful.  But it may
 +                      still not able to affect the final state of a string if
 +                      there are quirks related to this string.  This command
 +                      is useful when one want to control the state of the
 +                      feature group strings to debug BIOS issues related to
 +                      the OSPM features.
 +                      Examples:
 +                        1. 'acpi_osi="Module Device" acpi_osi=!*' can make
 +                           '_OSI("Module Device")' FALSE.
 +                        2. 'acpi_osi=!* acpi_osi="Module Device"' can make
 +                           '_OSI("Module Device")' TRUE.
 +                        3. 'acpi_osi=! acpi_osi=!* acpi_osi="Windows 2000"' is
 +                           equivalent to
 +                           'acpi_osi=!* acpi_osi=! acpi_osi="Windows 2000"'
 +                           and
 +                           'acpi_osi=!* acpi_osi="Windows 2000" acpi_osi=!',
 +                           they all will make '_OSI("Windows 2000")' TRUE.
 +
        acpi_pm_good    [X86]
                        Override the pmtimer bug detection: force the kernel
                        to assume that this machine's pmtimer latches its value
@@@ -1898,18 -1847,6 +1898,18 @@@
                        will be sent.
                        The default is to send the implementation identification
                        information.
 +      
 +      nfs.recover_lost_locks =
 +                      [NFSv4] Attempt to recover locks that were lost due
 +                      to a lease timeout on the server. Please note that
 +                      doing this risks data corruption, since there are
 +                      no guarantees that the file will remain unchanged
 +                      after the locks are lost.
 +                      If you want to enable the kernel legacy behaviour of
 +                      attempting to recover these locks, then set this
 +                      parameter to '1'.
 +                      The default parameter value of '0' causes the kernel
 +                      not to attempt recovery of lost locks.
  
        nfsd.nfs4_disable_idmapping=
                        [NFSv4] When set to the default of '1', the NFSv4
@@@ -3385,10 -3322,6 +3385,10 @@@
                                    them quite hard to use for exploits but
                                    might break your system.
  
 +      vt.color=       [VT] Default text color.
 +                      Format: 0xYX, X = foreground, Y = background.
 +                      Default: 0x07 = light gray on black.
 +
        vt.cur_default= [VT] Default cursor shape.
                        Format: 0xCCBBAA, where AA, BB, and CC are the same as
                        the parameters of the <Esc>[?A;B;Cc escape sequence;
@@@ -3428,12 -3361,6 +3428,12 @@@
                        overridden by individual drivers. 0 will hide
                        cursors, 1 will display them.
  
 +      vt.italic=      [VT] Default color for italic text; 0-15.
 +                      Default: 2 = green.
 +
 +      vt.underline=   [VT] Default color for underlined text; 0-15.
 +                      Default: 3 = cyan.
 +
        watchdog timers [HW,WDT] For information on watchdog timers,
                        see Documentation/watchdog/watchdog-parameters.txt
                        or other driver-specific files in the
@@@ -3485,6 -3412,10 +3485,10 @@@
                                the unplug protocol
                        never -- do not unplug even if version check succeeds
  
+       xen_nopvspin    [X86,XEN]
+                       Disables the ticketlock slowpath using Xen PV
+                       optimizations.
+ 
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]