Rebase against fded20df6c7422e85dbcd5a20475fd0c5d38d3c6.

patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch

@@ -1,4 +1,4 @@
-From 99431b53452b3c40a024de30d3b182b4b84a2cca Mon Sep 17 00:00:00 2001
+From 9fb2b15dba901a3d43fad7e89bdf65fa42d8d3a3 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for creating reparse points.
@@ -41,7 +41,7 @@ index 3b1cdb54f9f..6eb4690f8e0 100644
  EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
  x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index d49d4d5c26f..5d33cbda47e 100644
+index c011733626f..93e50bd6952 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -38,6 +38,7 @@
@@ -52,7 +52,7 @@ index d49d4d5c26f..5d33cbda47e 100644
  
  #ifndef IO_COMPLETION_ALL_ACCESS
  #define IO_COMPLETION_ALL_ACCESS 0x001F0003
-@@ -5245,6 +5246,156 @@ static void test_mailslot_name(void)
+@@ -5326,6 +5327,156 @@ static void test_mailslot_name(void)
      CloseHandle( device );
  }
  
@@ -209,15 +209,15 @@ index d49d4d5c26f..5d33cbda47e 100644
  START_TEST(file)
  {
      HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
-@@ -5315,5 +5466,6 @@ START_TEST(file)
-     test_query_attribute_information_file();
+@@ -5398,5 +5549,6 @@ START_TEST(file)
      test_ioctl();
+     test_query_ea();
      test_flush_buffers_file();
 +    test_reparse_points();
      test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 469c714f847..c644c22e578 100644
+index 604ca866890..58310fd8504 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -36,6 +36,8 @@

staging/upstream-commit

@@ -1 +1 @@
-f87ad783e23a2b6f5e9b8cf78dbf99bad4471a25
+fded20df6c7422e85dbcd5a20475fd0c5d38d3c6