Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

1 files changed, 84 insertions, 5 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 76c355214dc3..574ee67b6181 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -57,6 +57,7 @@ parameter is applicable:
         ISAPNP  ISA PnP code is enabled.
         ISDN    Appropriate ISDN support is enabled.
         JOY     Appropriate joystick support is enabled.
+        KVM     Kernel Virtual Machine support is enabled.
         LIBATA  Libata driver is enabled
         LP      Printer support is enabled.
         LOOP    Loopback device support is enabled.
@@ -1098,6 +1099,44 @@ and is between 256 and 4096 characters. It is defined in the file
         kstack=N        [X86] Print N words from the kernel stack
                         in oops dumps.
 
+        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-amd.nested= [KVM,AMD] Allow nested virtualization in KVM/SVM.
+                        Default is 0 (off)
+
+        kvm-amd.npt=    [KVM,AMD] Disable nested paging (virtualized MMU)
+                        for all guests.
+                        Default is 1 (enabled) if in 64bit or 32bit-PAE mode
+
+        kvm-intel.bypass_guest_pf=
+                        [KVM,Intel] Disables bypassing of guest page faults
+                        on Intel chips. Default is 1 (enabled)
+
+        kvm-intel.ept=  [KVM,Intel] Disable extended page tables
+                        (virtualized MMU) support on capable Intel chips.
+                        Default is 1 (enabled)
+
+        kvm-intel.emulate_invalid_guest_state=
+                        [KVM,Intel] Enable emulation of invalid guest states
+                        Default is 0 (disabled)
+
+        kvm-intel.flexpriority=
+                        [KVM,Intel] Disable FlexPriority feature (TPR shadow).
+                        Default is 1 (enabled)
+
+        kvm-intel.unrestricted_guest=
+                        [KVM,Intel] Disable unrestricted guest feature
+                        (virtualized real and unpaged mode) on capable
+                        Intel chips. Default is 1 (enabled)
+
+        kvm-intel.vpid= [KVM,Intel] Disable Virtual Processor Identification
+                        feature (tagged TLBs) on capable Intel chips.
+                        Default is 1 (enabled)
+
         l2cr=           [PPC]
 
         l3cr=           [PPC]
@@ -1503,6 +1542,14 @@ and is between 256 and 4096 characters. It is defined in the file
                         [NFS] set the TCP port on which the NFSv4 callback
                         channel should listen.
 
+        nfs.cache_getent=
+                        [NFS] sets the pathname to the program which is used
+                        to update the NFS client cache entries.
+
+        nfs.cache_getent_timeout=
+                        [NFS] sets the timeout after which an attempt to
+                        update a cache entry is deemed to have failed.
+
         nfs.idmap_cache_timeout=
                         [NFS] set the maximum lifetime for idmapper cache
                         entries.
@@ -1535,6 +1582,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         symbolic names: lapic and ioapic
                         Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
+        netpoll.carrier_timeout=
+                        [NET] Specifies amount of time (in seconds) that
+                        netpoll should wait for a carrier. By default netpoll
+                        waits 4 seconds.
+
         no387           [BUGS=X86-32] Tells the kernel to use the 387 maths
                         emulation library even if a 387 maths coprocessor
                         is present.
@@ -1919,11 +1971,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: { 0 | 1 }
                         See arch/parisc/kernel/pdc_chassis.c
 
-        percpu_alloc=   [X86] Select which percpu first chunk allocator to use.
-                        Allowed values are one of "lpage", "embed" and "4k".
-                        See comments in arch/x86/kernel/setup_percpu.c for
-                        details on each allocator.  This parameter is primarily
-                        for debugging and performance comparison.
+        percpu_alloc=   Select which percpu first chunk allocator to use.
+                        Currently supported values are "embed" and "page".
+                        Archs may support subset or none of the selections.
+                        See comments in mm/percpu.c for details on each
+                        allocator.  This parameter is primarily for debugging
+                        and performance comparison.
 
         pf.             [PARIDE]
                         See Documentation/blockdev/paride.txt.
@@ -2395,6 +2448,18 @@ and is between 256 and 4096 characters. It is defined in the file
         stifb=          [HW]
                         Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]]
 
+        sunrpc.min_resvport=
+        sunrpc.max_resvport=
+                        [NFS,SUNRPC]
+                        SunRPC servers often require that client requests
+                        originate from a privileged port (i.e. a port in the
+                        range 0 < portnr < 1024).
+                        An administrator who wishes to reserve some of these
+                        ports for other uses may adjust the range that the
+                        kernel's sunrpc client considers to be privileged
+                        using these two parameters to set the minimum and
+                        maximum port values.
+
         sunrpc.pool_mode=
                         [NFS]
                         Control how the NFS server code allocates CPUs to
@@ -2411,6 +2476,15 @@ and is between 256 and 4096 characters. It is defined in the file
                         pernode     one pool for each NUMA node (equivalent
                                     to global on non-NUMA machines)
 
+        sunrpc.tcp_slot_table_entries=
+        sunrpc.udp_slot_table_entries=
+                        [NFS,SUNRPC]
+                        Sets the upper limit on the number of simultaneous
+                        RPC calls that can be sent from the client to a
+                        server. Increasing these values may allow you to
+                        improve throughput, but will also increase the
+                        amount of memory reserved for use by the client.
+
         swiotlb=        [IA-64] Number of I/O TLB slabs
 
         switches=       [HW,M68k]
@@ -2480,6 +2554,11 @@ and is between 256 and 4096 characters. It is defined in the file
         trace_buf_size=nn[KMG]
                         [FTRACE] will set tracing buffer size.
 
+        trace_event=[event-list]
+                        [FTRACE] Set and start specified trace events in order
+                        to facilitate early boot debugging.
+                        See also Documentation/trace/events.txt
+
         trix=           [HW,OSS] MediaTrix AudioTrix Pro
                         Format:
                         <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>