From c062a34be3d92862138140ad3f6e7417e58a1da4 Mon Sep 17 00:00:00 2001
From: Elizabeth Figura <zfigura@codeweavers.com>
Date: Tue, 16 Sep 2025 17:03:19 -0500
Subject: [PATCH] Rebase against 58407c404938f5e83a4ab2a6fa7b7a75ad2b5e85.

---
 ...0001-ntdll-Implement-NtSetLdtEntries.patch | 22 +++++++++----------
 staging/upstream-commit                       |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch b/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch
index c87bca20..84379117 100644
--- a/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch
+++ b/patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch
@@ -1,4 +1,4 @@
-From f677f11f611d59a85e2919d599f90cb9d454b5e9 Mon Sep 17 00:00:00 2001
+From 71998d0382654821c685b83c38c9cbda183311a9 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Thu, 28 Apr 2016 18:14:36 +0800
 Subject: [PATCH] ntdll/tests: Add some tests for NtSetLdtEntries.
@@ -126,18 +126,18 @@ index c0303b471e8..64b62fefd0d 100644
     test_QueueUserWorkItem();
     test_RegisterWaitForSingleObject();
 diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
-index f8a0a9856e6..e0b04a01731 100644
+index e3e6416fa90..ac842cd4376 100644
 --- a/dlls/ntdll/unix/signal_i386.c
 +++ b/dlls/ntdll/unix/signal_i386.c
-@@ -2266,7 +2266,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_
-                 if (reply->flags)
-                     info->Entry = ldt_make_entry( reply->base, reply->limit, reply->flags );
-                 else
--                    status = STATUS_UNSUCCESSFUL;
-+                    status = STATUS_ACCESS_VIOLATION;
-             }
-         }
-         SERVER_END_REQ;
+@@ -2302,7 +2302,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_
+         if (base || limit || bits.type)
+             info->Entry = ldt_make_entry( base, limit, bits );
+         else
+-            status = STATUS_UNSUCCESSFUL;
++            status = STATUS_ACCESS_VIOLATION;
+     }
+ 
+     if (status == STATUS_SUCCESS && ret_len)
 -- 
 2.50.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 142e6ee4..dacf7ed3 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-7d26649f6375cd8bf765405237c85933c58e8de8
+58407c404938f5e83a4ab2a6fa7b7a75ad2b5e85