Merge trunk HEAD (r44067)

svn path=/branches/ros-amd64-bringup/; revision=44069

diff --cc reactos/base/applications/paint/rsrc.rc
Simple merge

diff --cc reactos/base/setup/usetup/inffile.c
Simple merge

diff --cc reactos/base/setup/usetup/inffile.h
Simple merge

diff --cc reactos/base/setup/usetup/usetup.h
Simple merge

diff --cc reactos/base/shell/explorer/dialogs/searchprogram.cpp
Simple merge

diff --cc reactos/base/shell/explorer/explorer.cpp
Simple merge

diff --cc reactos/base/shell/explorer/shell/filechild.cpp
Simple merge

diff --cc reactos/base/shell/explorer/shell/mainframe.cpp
Simple merge

diff --cc reactos/base/shell/explorer/shell/pane.cpp
Simple merge

diff --cc reactos/base/shell/explorer/shell/shellbrowser.cpp
Simple merge

diff --cc reactos/base/shell/explorer/taskbar/taskbar.cpp
Simple merge

diff --cc reactos/base/shell/explorer/taskbar/traynotify.cpp
Simple merge

diff --cc reactos/base/shell/explorer/utility/utility.cpp
Simple merge

diff --cc reactos/base/shell/explorer/utility/window.cpp
Simple merge

diff --cc reactos/base/shell/explorer/utility/window.h
Simple merge

diff --cc reactos/boot/bootdata/packages/reactos.dff
index a877ffe,bf61638..7f78ba8
--- 1/reactos/boot/bootdata/packages/reactos.dff
--- 2/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@@ -662,14 -661,17 +662,16 @@@ media\sounds\ReactOS_LogOn.wa
  boot\bootdata\bootcdregtest\regtest.cmd             7   optional
  
  ; Subsystems
 -subsystems\win32\csrss\csrss.exe                    1
 -subsystems\win32\csrss\win32csr\win32csr.dll        1
 -subsystems\ntvdm\ntvdm.exe                          1
 -subsystems\win32\win32k\win32k.sys                  1
 +;subsystems\win32\csrss\csrss.exe                    1
 +;subsystems\win32\csrss\win32csr\win32csr.dll        1
 +;subsystems\ntvdm\ntvdm.exe                          1
 +;subsystems\win32\win32k\win32k.sys                  1
  
  ; Optional/proprietary files
 -modules\optional\netkvm2k.inf                       6  optional
 -modules\optional\netkvm2k.cat                       6  optional
 -modules\optional\netkvm.sys                         2  optional
 +modules\optional\kvmnet.inf                         6  optional
 +modules\optional\kvmnet.sys                         2  optional
+ modules\optional\alcxwdm.inf                        6  optional
+ modules\optional\alcxwdm.sys                        2  optional
  modules\optional\mfc42.dll                          1  optional
  modules\optional\mfc42u.dll                         1  optional
  modules\optional\mfc71.dll                          1  optional

diff --cc reactos/boot/freeldr/freeldr/bootmgr.c
index eaa69eb,758b952..2cbac6f
--- 1/reactos/boot/freeldr/freeldr/bootmgr.c
--- 2/reactos/boot/freeldr/freeldr/bootmgr.c
+++ b/reactos/boot/freeldr/freeldr/bootmgr.c
@@@ -143,8 -140,8 +140,8 @@@ VOID RunLoader(VOID
                        // to have different install methods, etc.
                        LoadReactOSSetup();
                }
 -#ifdef __i386__
 +#if defined(__i386__) || defined(__x86_64__)
-               else if (_stricmp(SettingValue, "ReactOSSetup2") == 0)
+               else if (_stricmp(BootType, "ReactOSSetup2") == 0)
                {
                        // WinLdr-style boot
                        LoadReactOSSetup2();

diff --cc reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
Simple merge

diff --cc reactos/boot/freeldr/freeldr/freeldr_base.rbuild
Simple merge

diff --cc reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
Simple merge

diff --cc reactos/boot/freeldr/freeldr/include/arch/i386/i386.h
Simple merge

diff --cc reactos/boot/freeldr/freeldr/include/freeldr.h
Simple merge

diff --cc reactos/boot/freeldr/freeldr/mm/mm.c
Simple merge

diff --cc reactos/boot/freeldr/freeldr/options.c
index cc58e1d,2c1f6c6..4dabc89
--- 1/reactos/boot/freeldr/freeldr/options.c
--- 2/reactos/boot/freeldr/freeldr/options.c
+++ b/reactos/boot/freeldr/freeldr/options.c
@@@ -102,16 -113,6 +113,7 @@@ VOID DoOptionsMenu(VOID
        case REBOOT:
                OptionMenuReboot();
                break;
 -      }
+ #endif
 +      }
  }
- VOID OptionMenuReboot(VOID)
- {
-       UiMessageBox("The system will now reboot.");
- 
- #ifdef __i386__
-       DiskStopFloppyMotor();
-       SoftReboot();
- #else
- #endif
- }
 +

diff --cc reactos/boot/freeldr/freeldr/windows/winldr.c
Simple merge

diff --cc reactos/dll/ntdll/rtl/libsupp.c
Simple merge

diff --cc reactos/dll/win32/acledit/acledit.c
index 4c36213,aae903e..99e0e99
--- 1/reactos/dll/win32/acledit/acledit.c
--- 2/reactos/dll/win32/acledit/acledit.c
+++ b/reactos/dll/win32/acledit/acledit.c
@@@ -14,9 -14,9 +14,9 @@@
   *
   * You should have received a copy of the GNU Lesser General Public
   * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
 -/* $Id: acledit.c 35011 2008-08-01 16:29:40Z sginsberg $
 +/* $Id$
   *
   * PROJECT:         ReactOS Access Control List Editor
   * FILE:            lib/acledit/acledit.c

diff --cc reactos/dll/win32/gdi32/misc/wingl.c
Simple merge

diff --cc reactos/dll/win32/iphlpapi/resinfo_reactos.c
Simple merge

diff --cc reactos/dll/win32/kernel32/misc/errormsg.c
Simple merge

diff --cc reactos/dll/win32/kernel32/thread/thread.c
index cb5dab7,3fb6a6d..ee94309
--- 1/reactos/dll/win32/kernel32/thread/thread.c
--- 2/reactos/dll/win32/kernel32/thread/thread.c
+++ b/reactos/dll/win32/kernel32/thread/thread.c
@@@ -651,33 -651,32 +651,37 @@@ SetThreadPriorityBoost(IN HANDLE hThrea
  /*
   * @implemented
   */
- BOOL WINAPI
+ BOOL
+ WINAPI
  GetThreadSelectorEntry(IN HANDLE hThread,
-                      IN DWORD dwSelector,
-                      OUT LPLDT_ENTRY lpSelectorEntry)
+                        IN DWORD dwSelector,
+                        OUT LPLDT_ENTRY lpSelectorEntry)
  {
-   DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry;
-   NTSTATUS Status;
- 
-   DescriptionTableEntry.Selector = dwSelector;
-   Status = NtQueryInformationThread(hThread,
-                                     ThreadDescriptorTableEntry,
-                                     &DescriptionTableEntry,
-                                     sizeof(DESCRIPTOR_TABLE_ENTRY),
-                                     NULL);
-   if(!NT_SUCCESS(Status))
-   {
-     SetLastErrorByStatus(Status);
-     return FALSE;
-   }
 +#ifdef _M_IX86
+     DESCRIPTOR_TABLE_ENTRY DescriptionTableEntry;
+     NTSTATUS Status;
  
-   *lpSelectorEntry = DescriptionTableEntry.Descriptor;
-   return TRUE;
+     /* Set the selector and do the query */
+     DescriptionTableEntry.Selector = dwSelector;
+     Status = NtQueryInformationThread(hThread,
+                                       ThreadDescriptorTableEntry,
+                                       &DescriptionTableEntry,
+                                       sizeof(DESCRIPTOR_TABLE_ENTRY),
+                                       NULL);
+     if (!NT_SUCCESS(Status))
+     {
+         /* Fail */
+         SetLastErrorByStatus(Status);
+         return FALSE;
+     }
+ 
+     /* Success, return the selector */
+     *lpSelectorEntry = DescriptionTableEntry.Descriptor;
+     return TRUE;
 +#else
 +    DPRINT1("Calling GetThreadSelectorEntry!\n");
 +    return FALSE;
 +#endif
  }
  
  /*

diff --cc reactos/dll/win32/odbc32/proxyodbc.c
index cddfdcf,58d5870..b20157f
--- 1/reactos/dll/win32/odbc32/proxyodbc.c
--- 2/reactos/dll/win32/odbc32/proxyodbc.c
+++ b/reactos/dll/win32/odbc32/proxyodbc.c
@@@ -15,11 -15,11 +15,11 @@@
   *
   * You should have received a copy of the GNU Lesser General Public
   * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   *
   * NOTES:
 - *   Proxy ODBC driver manager.  This manager delegates all ODBC
 - *   calls to a real ODBC driver manager named by the environment
 + *   Proxy ODBC driver manager.  This manager delegates all ODBC 
 + *   calls to a real ODBC driver manager named by the environment 
   *   variable LIB_ODBC_DRIVER_MANAGER, or to libodbc.so if the
   *   variable is not set.
   *

diff --cc reactos/dll/win32/odbc32/proxyodbc.h
Simple merge

diff --cc reactos/dll/win32/shell32/fprop.c
Simple merge

diff --cc reactos/dll/win32/shell32/she_ocmenu.c
index 6f393a8,c98a45a..0699d19
--- 1/reactos/dll/win32/shell32/she_ocmenu.c
--- 2/reactos/dll/win32/shell32/she_ocmenu.c
+++ b/reactos/dll/win32/shell32/she_ocmenu.c
@@@ -449,10 -448,10 +448,10 @@@ StoreNewSettings(LPCWSTR szFileName, WC
      }
  
      /* insert the entry */
 -    result = (*AddMRUStringW)((HANDLE)hList, szAppName);
 +    result = (*AddMRUStringW)(hList, szAppName);
  
      /* close mru list */
-     (*FreeMRUList)(hList);
+     (*FreeMRUListProc)((HANDLE)hList);
      /* create mru list key */
      RegCloseKey(hKey);
  }

diff --cc reactos/dll/win32/shell32/shfldr_admintools.c
Simple merge

diff --cc reactos/dll/win32/shell32/shfldr_netplaces.c
Simple merge

diff --cc reactos/dll/win32/shell32/shfldr_printers.c
Simple merge

diff --cc reactos/dll/win32/user32/windows/defwnd.c
Simple merge

diff --cc reactos/dll/win32/user32/windows/menu.c
Simple merge

diff --cc reactos/dll/win32/user32/windows/nonclient.c
Simple merge

diff --cc reactos/dll/win32/wdmaud.drv/wdmaud.c
Simple merge

diff --cc reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
Simple merge

diff --cc reactos/drivers/network/afd/afd/main.c
Simple merge

diff --cc reactos/drivers/network/dd/pcnet/pcnet.c
Simple merge

diff --cc reactos/drivers/network/tcpip/tcpip/dispatch.c
Simple merge

diff --cc reactos/drivers/storage/floppy/floppy.c
Simple merge

diff --cc reactos/drivers/storage/scsiport/scsiport.c
Simple merge

diff --cc reactos/drivers/video/videoprt/agp.c
Simple merge

diff --cc reactos/drivers/video/videoprt/int10.c
Simple merge

diff --cc reactos/drivers/video/videoprt/interrupt.c
Simple merge

diff --cc reactos/drivers/video/videoprt/resource.c
Simple merge

diff --cc reactos/drivers/video/videoprt/services.c
Simple merge

diff --cc reactos/drivers/video/videoprt/videoprt.c
Simple merge

diff --cc reactos/drivers/wdm/audio/legacy/wdmaud/interface.h
Simple merge

diff --cc reactos/hal/halamd64/generic/generic.rbuild
index 7c22ec5,8eb4d95..d613424
--- 1/reactos/hal/halamd64/generic/generic.rbuild
--- 2/reactos/hal/halamd64/generic/generic.rbuild
+++ b/reactos/hal/halamd64/generic/generic.rbuild
@@@ -11,6 -10,6 +11,7 @@@
                <file>misc.c</file>
                <file>mps.S</file>
                <file>systimer.S</file>
++              <file>usage.c</file>
                <pch>../include/hal.h</pch>
        </module>
  </group>

diff --cc reactos/hal/halamd64/generic/halinit.c
index d3d834b,d3d834b..152618c
--- 1/reactos/hal/halamd64/generic/halinit.c
--- 2/reactos/hal/halamd64/generic/halinit.c
+++ b/reactos/hal/halamd64/generic/halinit.c
@@@ -130,8 -130,8 +130,8 @@@ DPRINT1("HalInitSystem 6\n")
      }
      else if (BootPhase == 1)
      {
--        /* Initialize the default HAL stubs for bus handling functions */
--        HalpInitNonBusHandler();
++        /* Initialize bus handlers */
++        //HalpInitBusHandler();
  
          /* Enable the clock interrupt */
          PKIDTENTRY64 IdtEntry = &((PKIPCR)KeGetPcr())->IdtBase[0x30];

diff --cc reactos/hal/halamd64/generic/systimer.S
index 79d282a,298cea2..d8cb93a
--- 1/reactos/hal/halamd64/generic/systimer.S
--- 2/reactos/hal/halamd64/generic/systimer.S
+++ b/reactos/hal/halamd64/generic/systimer.S
@@@ -17,12 -17,12 +17,38 @@@ _HalpLastPerfCounterLow:    .long 
  _HalpLastPerfCounterHigh:   .long 0
  _HalpPerfCounterLow:        .long 0
  _HalpPerfCounterHigh:       .long 0
++_HalpSystemHardwareFlags:   .long 0
  
  _UnhandledMsg:
      .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n"
  
  /* FUNCTIONS *****************************************************************/
  
++.global _HalpReleaseCmosSpinLock
++.func HalpReleaseCmosSpinLock
++_HalpReleaseCmosSpinLock:
++
++.endfunc
++
++.global _HalpAcquireSystemHardwareSpinLock
++.func HalpAcquireSystemHardwareSpinLock
++_HalpAcquireSystemHardwareSpinLock:
++
++.endfunc
++
++.global _HalpCalibrateStallExecution@0
++.func HalpCalibrateStallExecution@0
++_HalpCalibrateStallExecution@0:
++
++.endfunc
++
++.globl _HalpProfileInterrupt
++.func HalpProfileInterrupt
++_HalpProfileInterrupt:
++
++.endfunc
++
++
  .globl _KeStallExecutionProcessor
  .func KeStallExecutionProcessor
  _KeStallExecutionProcessor:

diff --cc reactos/hal/halx86/hal_generic_amd64.rbuild
index c343b64,ad0bccf..157c41d
--- 1/reactos/hal/halx86/hal_generic_amd64.rbuild
--- 2/reactos/hal/halx86/hal_generic_amd64.rbuild
+++ b/reactos/hal/halx86/hal_generic_amd64.rbuild
@@@ -4,16 -4,21 +4,22 @@@
        <module name="hal_generic_amd64" type="objectlibrary">
                <include>include</include>
                <include base="ntoskrnl">include</include>
 +              <define name="_DISABLE_TIDENTS" />
                <define name="_NTHAL_" />
                <directory name="generic">
+                       <directory name="bus">
+                               <file>bushndlr.c</file>
+                               <file>isabus.c</file>
+                               <file>halbus.c</file>
++                              <file>pcibus.c</file>
+                               <file>pcidata.c</file>
+                               <file>sysbus.c</file>
+                       </directory>
                        <file>beep.c</file>
-                       <file>bus.c</file>
                        <file>cmos.c</file>
                        <file>dma.c</file>
                        <file>drive.c</file>
                        <file>display.c</file>
--                      <file>pci.c</file>
                        <file>profil.c</file>
                        <file>reboot.c</file>
                        <file>sysinfo.c</file>

diff --cc reactos/hal/halx86/mp/apic.c
Simple merge

diff --cc reactos/include/ddk/winddk.h
Simple merge

diff --cc reactos/include/ndk/amd64/asm.h
Simple merge

diff --cc reactos/include/ndk/amd64/ketypes.h
Simple merge

diff --cc reactos/include/ndk/i386/ketypes.h
Simple merge

diff --cc reactos/include/ndk/ldrtypes.h
Simple merge

diff --cc reactos/include/psdk/commctrl.h
Simple merge

diff --cc reactos/include/psdk/dsdriver.h
Simple merge

diff --cc reactos/include/psdk/mmddk.h
Simple merge

diff --cc reactos/include/psdk/winsock2.h
Simple merge

diff --cc reactos/include/psdk/winternl.h
Simple merge

diff --cc reactos/include/reactos/win32k/ntuser.h
Simple merge

diff --cc reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c
Simple merge

diff --cc reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c
Simple merge

diff --cc reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c
Simple merge

diff --cc reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c
Simple merge

diff --cc reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c
Simple merge

diff --cc reactos/lib/rtl/rtlp.h
Simple merge

diff --cc reactos/lib/sdk/crt/include/internal/wine/cppexcept.h
Simple merge

diff --cc reactos/ntoskrnl/ex/init.c
Simple merge

diff --cc reactos/ntoskrnl/include/internal/arch/intrin_i.h
Simple merge

diff --cc reactos/ntoskrnl/include/internal/arch/ke.h
Simple merge

diff --cc reactos/ntoskrnl/include/internal/arch/mm.h
Simple merge

diff --cc reactos/ntoskrnl/include/internal/ke.h
Simple merge

diff --cc reactos/ntoskrnl/include/internal/ke_x.h
Simple merge

diff --cc reactos/ntoskrnl/include/internal/mm.h
Simple merge

diff --cc reactos/ntoskrnl/kd/kdmain.c
Simple merge

diff --cc reactos/ntoskrnl/kd64/kdapi.c
Simple merge

diff --cc reactos/ntoskrnl/kdbg/i386/i386-dis.c
Simple merge

diff --cc reactos/ntoskrnl/kdbg/kdb_symbols.c
Simple merge

diff --cc reactos/ntoskrnl/ke/freeldr.c
index bfb65d9,65fd00d..ddb4cb8
--- 1/reactos/ntoskrnl/ke/freeldr.c
--- 2/reactos/ntoskrnl/ke/freeldr.c
+++ b/reactos/ntoskrnl/ke/freeldr.c
@@@ -9,16 -9,16 +9,16 @@@
  /* INCLUDES *****************************************************************/
  
  #include <ntoskrnl.h>
- //#define NDEBUG
+ #define NDEBUG
  #include <debug.h>
  
- #ifdef _M_PPC
+ #if defined(_PPC_)
  #include <ppcmmu/mmu.h>
  #define KERNEL_RVA(x) RVA(x,0x80800000)
 -#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x + KernelBase) >> PAGE_SHIFT)
 +#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) + KernelBase) >> PAGE_SHIFT)
  #else
  #define KERNEL_RVA(x) RVA(x,KSEG0_BASE)
 -#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT)
 +#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) & ~KSEG0_BASE) >> PAGE_SHIFT)
  #endif
  
  typedef struct _BIOS_MEMORY_DESCRIPTOR
@@@ -29,12 -29,8 +29,11 @@@
  
  /* GLOBALS *******************************************************************/
  
 +/* Function pointer for early debug prints */
 +ULONG (*FrLdrDbgPrint)(const char *Format, ...);
 +
  /* FreeLDR Loader Data */
  PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock;
- BOOLEAN AcpiTableDetected = FALSE;
  ADDRESS_RANGE KeMemoryMap[64];
  ULONG KeMemoryMapRangeCount;
  
@@@ -952,7 -974,7 +977,7 @@@ KiRosFrldrLpbToNtLpb(IN PROS_LOADER_PAR
      /* Build entries for ReactOS memory ranges, which uses ARC Descriptors */
      KiRosBuildOsMemoryMap();
  
- #if defined(_M_IX86) || defined(_M_AMD64)
 -#if defined(_X86_)
++#if defined(_X86_) || defined(_M_AMD64)
      /* Build entries for the reserved map, which uses ARC Descriptors */
      KiRosBuildReservedMemoryMap();
  #endif

diff --cc reactos/ntoskrnl/ke/i386/cpu.c
Simple merge

diff --cc reactos/ntoskrnl/mm/ARM3/miarm.h
index a02664a,e319eee..ed86fe3
--- 1/reactos/ntoskrnl/mm/ARM3/miarm.h
--- 2/reactos/ntoskrnl/mm/ARM3/miarm.h
+++ b/reactos/ntoskrnl/mm/ARM3/miarm.h
@@@ -89,9 -86,12 +90,12 @@@ typedef struct _POOL_HEADE
  // Everything depends on this
  //
  C_ASSERT(sizeof(POOL_HEADER) == 8);
 -C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY));
 +//C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY));
  
+ extern ULONG ExpNumberOfPagedPools;
  extern POOL_DESCRIPTOR NonPagedPoolDescriptor;
+ extern PPOOL_DESCRIPTOR ExpPagedPoolDescriptor[16 + 1];
+ extern PVOID PoolTrackTable;
  
  //
  // END FIXFIX
@@@ -155,11 -155,17 +159,17 @@@ extern PVOID MmPagedPoolStart
  extern PVOID MmPagedPoolEnd;
  extern PVOID MmNonPagedSystemStart;
  extern PVOID MiSystemViewStart;
 -extern ULONG MmSystemViewSize;
 +extern ULONG_PTR MmSystemViewSize;
  extern PVOID MmSessionBase;
  extern PVOID MiSessionSpaceEnd;
 -extern ULONG MmSizeOfPagedPoolInBytes;
 +extern ULONG_PTR MmSizeOfPagedPoolInBytes;
  extern PMMPTE MmSystemPagePtes;
+ extern PVOID MmSystemCacheStart;
+ extern PVOID MmSystemCacheEnd;
+ extern MMSUPPORT MmSystemCacheWs;
+ extern SIZE_T MmAllocatedNonPagedPool;
+ extern ULONG_PTR MmSubsectionBase;
+ extern ULONG MmSpecialPoolTag;
  
  NTSTATUS
  NTAPI

diff --cc reactos/ntoskrnl/mm/i386/page.c
Simple merge

diff --cc reactos/ntoskrnl/mm/section.c
Simple merge

diff --cc reactos/ntoskrnl/mm/sysldr.c
Simple merge

diff --cc reactos/ntoskrnl/ntoskrnl-generic.rbuild
Simple merge

diff --cc reactos/ntoskrnl/ntoskrnl.pspec
Simple merge

diff --cc reactos/ntoskrnl/ps/kill.c
Simple merge

diff --cc reactos/ntoskrnl/ps/query.c
Simple merge

diff --cc reactos/ntoskrnl/rtl/libsupp.c
Simple merge

diff --cc reactos/subsystems/win32/win32k/eng/engwindow.c
Simple merge

diff --cc reactos/subsystems/win32/win32k/ntuser/misc.c
Simple merge

diff --cc reactos/tools/rbuild/backend/mingw/mingw.cpp
Simple merge