drop exit-make-setting-exit_state-consistent.patch from everywhere

diff --git a/queue-4.14/exit-make-setting-exit_state-consistent.patch b/queue-4.14/exit-make-setting-exit_state-consistent.patch
deleted file mode 100644 (file)
index dcf77aa..0000000
--- a/queue-4.14/exit-make-setting-exit_state-consistent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5c27da12d347a3cef4b7a6a14db182857ecbcd58 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian@brauner.io>
-Date: Mon, 29 Jul 2019 17:48:24 +0200
-Subject: exit: make setting exit_state consistent
-
-[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
-
-Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state")
-we unconditionally set exit_state to EXIT_ZOMBIE before calling into
-do_notify_parent(). This was done to eliminate a race when querying
-exit_state in do_notify_pidfd().
-Back then we decided to do the absolute minimal thing to fix this and
-not touch the rest of the exit_notify() function where exit_state is
-set.
-Since this fix has not caused any issues change the setting of
-exit_state to EXIT_DEAD in the autoreap case to account for the fact hat
-exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned
-but also explicitly requested in [1] and makes the whole code more
-consistent.
-
-/* References */
-[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
-
-Signed-off-by: Christian Brauner <christian@brauner.io>
-Acked-by: Oleg Nesterov <oleg@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 15437cfdcd70d..c71e7ad4f7b48 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -730,9 +730,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
-               autoreap = true;
-       }
- 
--      tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
--      if (tsk->exit_state == EXIT_DEAD)
-+      if (autoreap) {
-+              tsk->exit_state = EXIT_DEAD;
-               list_add(&tsk->ptrace_entry, &dead);
-+      }
- 
-       /* mt-exec, de_thread() is waiting for group leader */
-       if (unlikely(tsk->signal->notify_count < 0))
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index a57122e981c057563c990c507fd7d1729cae4e9e..0575be92a4103f08791f86e4a0cfbda1e710c12d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -29,7 +29,6 @@ libata-zpodd-fix-small-read-overflow-in-zpodd_get_me.patch
 drm-bridge-lvds-encoder-fix-build-error-while-config.patch
 scsi-hpsa-correct-scsi-command-status-issue-after-re.patch
 scsi-qla2xxx-fix-possible-fcport-null-pointer-derefe.patch
-exit-make-setting-exit_state-consistent.patch
 ata-libahci-do-not-complain-in-case-of-deferred-prob.patch
 kbuild-modpost-handle-kbuild_extra_symbols-only-for-.patch
 arm64-efi-fix-variable-si-set-but-not-used.patch

diff --git a/queue-4.19/exit-make-setting-exit_state-consistent.patch b/queue-4.19/exit-make-setting-exit_state-consistent.patch
deleted file mode 100644 (file)
index 9b3d7be..0000000
--- a/queue-4.19/exit-make-setting-exit_state-consistent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 06935f1b34141c8581abc5751744e43133fe5d57 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian@brauner.io>
-Date: Mon, 29 Jul 2019 17:48:24 +0200
-Subject: exit: make setting exit_state consistent
-
-[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
-
-Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state")
-we unconditionally set exit_state to EXIT_ZOMBIE before calling into
-do_notify_parent(). This was done to eliminate a race when querying
-exit_state in do_notify_pidfd().
-Back then we decided to do the absolute minimal thing to fix this and
-not touch the rest of the exit_notify() function where exit_state is
-set.
-Since this fix has not caused any issues change the setting of
-exit_state to EXIT_DEAD in the autoreap case to account for the fact hat
-exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned
-but also explicitly requested in [1] and makes the whole code more
-consistent.
-
-/* References */
-[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
-
-Signed-off-by: Christian Brauner <christian@brauner.io>
-Acked-by: Oleg Nesterov <oleg@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index e10de9836dd77..1c1633cc197e6 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -732,9 +732,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
-               autoreap = true;
-       }
- 
--      tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
--      if (tsk->exit_state == EXIT_DEAD)
-+      if (autoreap) {
-+              tsk->exit_state = EXIT_DEAD;
-               list_add(&tsk->ptrace_entry, &dead);
-+      }
- 
-       /* mt-exec, de_thread() is waiting for group leader */
-       if (unlikely(tsk->signal->notify_count < 0))
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 18dc63919b6c95fec027190aa46283f7776cce64..cdc4ab85cde64192701a6b571fe0252f754b65a0 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -36,7 +36,6 @@ drm-bridge-lvds-encoder-fix-build-error-while-config.patch
 btrfs-fix-deadlock-between-fiemap-and-transaction-co.patch
 scsi-hpsa-correct-scsi-command-status-issue-after-re.patch
 scsi-qla2xxx-fix-possible-fcport-null-pointer-derefe.patch
-exit-make-setting-exit_state-consistent.patch
 drm-amdgpu-fix-a-potential-information-leaking-bug.patch
 ata-libahci-do-not-complain-in-case-of-deferred-prob.patch
 kbuild-modpost-handle-kbuild_extra_symbols-only-for-.patch

diff --git a/queue-4.4/exit-make-setting-exit_state-consistent.patch b/queue-4.4/exit-make-setting-exit_state-consistent.patch
deleted file mode 100644 (file)
index 3a3650b..0000000
--- a/queue-4.4/exit-make-setting-exit_state-consistent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 20b45c6d67fd817ea9877ccc2d12eb94e7c503b2 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian@brauner.io>
-Date: Mon, 29 Jul 2019 17:48:24 +0200
-Subject: exit: make setting exit_state consistent
-
-[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
-
-Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state")
-we unconditionally set exit_state to EXIT_ZOMBIE before calling into
-do_notify_parent(). This was done to eliminate a race when querying
-exit_state in do_notify_pidfd().
-Back then we decided to do the absolute minimal thing to fix this and
-not touch the rest of the exit_notify() function where exit_state is
-set.
-Since this fix has not caused any issues change the setting of
-exit_state to EXIT_DEAD in the autoreap case to account for the fact hat
-exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned
-but also explicitly requested in [1] and makes the whole code more
-consistent.
-
-/* References */
-[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
-
-Signed-off-by: Christian Brauner <christian@brauner.io>
-Acked-by: Oleg Nesterov <oleg@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 03f6722302b54..14c2f0717ee4b 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -619,9 +619,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
-               autoreap = true;
-       }
- 
--      tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
--      if (tsk->exit_state == EXIT_DEAD)
-+      if (autoreap) {
-+              tsk->exit_state = EXIT_DEAD;
-               list_add(&tsk->ptrace_entry, &dead);
-+      }
- 
-       /* mt-exec, de_thread() is waiting for group leader */
-       if (unlikely(tsk->signal->notify_count < 0))
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index dec03266d9be83df8ff83f493ab0460ac25a93a8..7f7686cf2ec0c4651331bf094a8be7891ea14151 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -48,7 +48,6 @@ perf-header-fix-divide-by-zero-error-if-f_header.att.patch
 perf-header-fix-use-of-unitialized-value-warning.patch
 libata-zpodd-fix-small-read-overflow-in-zpodd_get_me.patch
 scsi-hpsa-correct-scsi-command-status-issue-after-re.patch
-exit-make-setting-exit_state-consistent.patch
 ata-libahci-do-not-complain-in-case-of-deferred-prob.patch
 kbuild-modpost-handle-kbuild_extra_symbols-only-for-.patch
 ib-core-add-mitigation-for-spectre-v1.patch

diff --git a/queue-4.9/exit-make-setting-exit_state-consistent.patch b/queue-4.9/exit-make-setting-exit_state-consistent.patch
deleted file mode 100644 (file)
index 108d4c1..0000000
--- a/queue-4.9/exit-make-setting-exit_state-consistent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1fc8a4c52e0a776f2dd9ab33c851ea29c8035615 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian@brauner.io>
-Date: Mon, 29 Jul 2019 17:48:24 +0200
-Subject: exit: make setting exit_state consistent
-
-[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
-
-Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state")
-we unconditionally set exit_state to EXIT_ZOMBIE before calling into
-do_notify_parent(). This was done to eliminate a race when querying
-exit_state in do_notify_pidfd().
-Back then we decided to do the absolute minimal thing to fix this and
-not touch the rest of the exit_notify() function where exit_state is
-set.
-Since this fix has not caused any issues change the setting of
-exit_state to EXIT_DEAD in the autoreap case to account for the fact hat
-exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned
-but also explicitly requested in [1] and makes the whole code more
-consistent.
-
-/* References */
-[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
-
-Signed-off-by: Christian Brauner <christian@brauner.io>
-Acked-by: Oleg Nesterov <oleg@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index d9394fcd0e2c3..d8fee3e1ec1f2 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -694,9 +694,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
-               autoreap = true;
-       }
- 
--      tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
--      if (tsk->exit_state == EXIT_DEAD)
-+      if (autoreap) {
-+              tsk->exit_state = EXIT_DEAD;
-               list_add(&tsk->ptrace_entry, &dead);
-+      }
- 
-       /* mt-exec, de_thread() is waiting for group leader */
-       if (unlikely(tsk->signal->notify_count < 0))
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 415d2e1e656dfd731b406c07338c53d2bd7ae97e..d0edbf6a83bfc2e4724b749420eb84431268bfce 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -72,7 +72,6 @@ perf-header-fix-divide-by-zero-error-if-f_header.att.patch
 perf-header-fix-use-of-unitialized-value-warning.patch
 libata-zpodd-fix-small-read-overflow-in-zpodd_get_me.patch
 scsi-hpsa-correct-scsi-command-status-issue-after-re.patch
-exit-make-setting-exit_state-consistent.patch
 ata-libahci-do-not-complain-in-case-of-deferred-prob.patch
 kbuild-modpost-handle-kbuild_extra_symbols-only-for-.patch
 arm64-efi-fix-variable-si-set-but-not-used.patch

diff --git a/queue-5.2/exit-make-setting-exit_state-consistent.patch b/queue-5.2/exit-make-setting-exit_state-consistent.patch
deleted file mode 100644 (file)
index f8d139e..0000000
--- a/queue-5.2/exit-make-setting-exit_state-consistent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 83cda48d1da3873cb18f3e3c30299929c3b02cf5 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian@brauner.io>
-Date: Mon, 29 Jul 2019 17:48:24 +0200
-Subject: exit: make setting exit_state consistent
-
-[ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ]
-
-Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state")
-we unconditionally set exit_state to EXIT_ZOMBIE before calling into
-do_notify_parent(). This was done to eliminate a race when querying
-exit_state in do_notify_pidfd().
-Back then we decided to do the absolute minimal thing to fix this and
-not touch the rest of the exit_notify() function where exit_state is
-set.
-Since this fix has not caused any issues change the setting of
-exit_state to EXIT_DEAD in the autoreap case to account for the fact hat
-exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned
-but also explicitly requested in [1] and makes the whole code more
-consistent.
-
-/* References */
-[1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com
-
-Signed-off-by: Christian Brauner <christian@brauner.io>
-Acked-by: Oleg Nesterov <oleg@redhat.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/exit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/exit.c b/kernel/exit.c
-index a75b6a7f458a7..0922e84ba6c1f 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -733,9 +733,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
-               autoreap = true;
-       }
- 
--      tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
--      if (tsk->exit_state == EXIT_DEAD)
-+      if (autoreap) {
-+              tsk->exit_state = EXIT_DEAD;
-               list_add(&tsk->ptrace_entry, &dead);
-+      }
- 
-       /* mt-exec, de_thread() is waiting for group leader */
-       if (unlikely(tsk->signal->notify_count < 0))
--- 
-2.20.1
-

diff --git a/queue-5.2/series b/queue-5.2/series
index 04cad3a0da8c4a0b6c2bd1f41e1bd38c3464a8e6..ed09f67c7dad5c9b91d63012098547b07cf6bf74 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -59,7 +59,6 @@ drm-bridge-tc358764-fix-build-error.patch
 btrfs-fix-deadlock-between-fiemap-and-transaction-co.patch
 scsi-hpsa-correct-scsi-command-status-issue-after-re.patch
 scsi-qla2xxx-fix-possible-fcport-null-pointer-derefe.patch
-exit-make-setting-exit_state-consistent.patch
 tracing-fix-header-include-guards-in-trace-event-hea.patch
 drm-amdkfd-fix-byte-align-on-vegam.patch
 drm-amd-powerplay-fix-null-pointer-dereference-aroun.patch