Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core

diff --combined Documentation/kernel-parameters.txt
index fc22e922342742e130f8b8355db35bcf7f0f4b5d,319785b6dcb1d024892bca7f9eb6c8195d8bcf11..4a7700876c9622fccb20d80aed9655eb29b53594
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,7 -49,6 +49,7 @@@ parameter is applicable
        ISAPNP  ISA PnP code is enabled.
        ISDN    Appropriate ISDN support is enabled.
        JOY     Appropriate joystick support is enabled.
 +      KMEMTRACE kmemtrace is enabled.
        LIBATA  Libata driver is enabled
        LP      Printer support is enabled.
        LOOP    Loopback device support is enabled.
@@@ -135,7 -134,7 +135,7 @@@ and is between 256 and 4096 characters
  
        acpi=           [HW,ACPI,X86-64,i386]
                        Advanced Configuration and Power Interface
-                       Format: { force | off | ht | strict | noirq }
+                       Format: { force | off | ht | strict | noirq | rsdt }
                        force -- enable ACPI if default was off
                        off -- disable ACPI if default was on
                        noirq -- do not use ACPI for IRQ routing
@@@ -1046,15 -1045,6 +1046,15 @@@
                        use the HighMem zone if it exists, and the Normal
                        zone if it does not.
  
 +      kmemtrace.enable=       [KNL,KMEMTRACE] Format: { yes | no }
 +                              Controls whether kmemtrace is enabled
 +                              at boot-time.
 +
 +      kmemtrace.subbufs=n     [KNL,KMEMTRACE] Overrides the number of
 +                      subbufs kmemtrace's relay channel has. Set this
 +                      higher than default (KMEMTRACE_N_SUBBUFS in code) if
 +                      you experience buffer overruns.
 +
        movablecore=nn[KMG]     [KNL,X86-32,IA-64,PPC,X86-64] This parameter
                        is similar to kernelcore except it specifies the
                        amount of memory used for migratable allocations.

diff --combined MAINTAINERS
index 0ad46148a17a40d8cbe2378f0598428c89305dd6,59fd2d1d94a772a6262669ff8947b35b4bbd0f7a..f1d45b975a1a2f7150642feef032b2e228633f3b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2623,12 -2623,6 +2623,12 @@@ M:    jason.wessel@windriver.co
  L:    kgdb-bugreport@lists.sourceforge.net
  S:    Maintained
  
 +KMEMTRACE
 +P:    Eduard - Gabriel Munteanu
 +M:    eduard.munteanu@linux360.ro
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  KPROBES
  P:    Ananth N Mavinakayanahalli
  M:    ananth@in.ibm.com
@@@ -3340,8 -3334,8 +3340,8 @@@ P:      Jeremy Fitzharding
  M:    jeremy@xensource.com
  P:    Chris Wright
  M:    chrisw@sous-sol.org
- P:    Zachary Amsden
- M:    zach@vmware.com
+ P:    Alok Kataria
+ M:    akataria@vmware.com
  P:    Rusty Russell
  M:    rusty@rustcorp.com.au
  L:    virtualization@lists.osdl.org

diff --combined arch/ia64/Kconfig
index 8b6a8a554afadfa3c40611e91013030c49653230,4eb45c0124986279a35d33731a71fcdaf72d53aa..5b2a2379a43989dfb92f688a1defb26173161a0e
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -22,9 -22,6 +22,9 @@@ config IA6
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
 +      select HAVE_FTRACE_MCOUNT_RECORD
 +      select HAVE_DYNAMIC_FTRACE if (!ITANIUM)
 +      select HAVE_FUNCTION_TRACER
        select HAVE_DMA_ATTRS
        select HAVE_KVM
        select HAVE_ARCH_TRACEHOOK
@@@ -224,7 -221,11 +224,11 @@@ config IA64_HP_SI
  
  config IA64_XEN_GUEST
        bool "Xen guest"
+       select SWIOTLB
        depends on XEN
+       help
+         Build a kernel that runs on Xen guest domain. At this moment only
+         16KB page size in supported.
  
  endchoice
  
@@@ -482,8 -483,7 +486,7 @@@ config HOLES_IN_ZON
        default y if VIRTUAL_MEM_MAP
  
  config HAVE_ARCH_EARLY_PFN_TO_NID
-       def_bool y
-       depends on NEED_MULTIPLE_NODES
+       def_bool NUMA && SPARSEMEM
  
  config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y