]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Drop ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
authorSasha Levin <sashal@kernel.org>
Mon, 25 May 2020 02:43:43 +0000 (22:43 -0400)
committerSasha Levin <sashal@kernel.org>
Mon, 25 May 2020 02:43:43 +0000 (22:43 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-4.14/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch [deleted file]
queue-4.14/series
queue-4.19/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch [deleted file]
queue-4.19/series
queue-4.4/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch [deleted file]
queue-4.4/series
queue-4.9/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch [deleted file]
queue-4.9/series

diff --git a/queue-4.14/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch b/queue-4.14/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
deleted file mode 100644 (file)
index ab8735c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From d48b15b0bc7bfab006a20888cec8f03d9067a022 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Jul 2019 16:39:31 -0700
-Subject: ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit 25a09ce79639a8775244808c17282c491cff89cf ]
-
-Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"),
-which was merged through the crypto tree for v5.3, changed ppp_mppe.c to
-use the new arc4_crypt() library function rather than access RC4 through
-the dynamic crypto_skcipher API.
-
-Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was
-merged through the net tree and added a module soft-dependency on "arc4".
-
-The latter commit no longer makes sense because the code now uses the
-"libarc4" module rather than "arc4", and also due to the direct use of
-arc4_crypt(), no module soft-dependency is required.
-
-So revert the latter commit.
-
-Cc: Takashi Iwai <tiwai@suse.de>
-Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ppp/ppp_mppe.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
-index d9eda7c217e9..6c7fd98cb00a 100644
---- a/drivers/net/ppp/ppp_mppe.c
-+++ b/drivers/net/ppp/ppp_mppe.c
-@@ -63,7 +63,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@fcusack.com>");
- MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
--MODULE_SOFTDEP("pre: arc4");
- MODULE_VERSION("1.0.2");
- static unsigned int
--- 
-2.25.1
-
index dc780fdda299bd4af72cfed50fe00703958be1ad..c8a9ab7e18ecc715c57c2af0935c7545d6c56489 100644 (file)
@@ -43,7 +43,6 @@ x86-uaccess-ubsan-fix-ubsan-vs.-smap.patch
 ubsan-build-ubsan.c-more-conservatively.patch
 libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch
 libnvdimm-btt-fix-lba-masking-during-free-list-popul.patch
-ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
 media-fdp1-fix-r-car-m3-n-naming-in-debug-message.patch
 edac-ghes-use-cper-module-handles-to-locate-dimms.patch
 cxgb4-free-mac_hlist-properly.patch
diff --git a/queue-4.19/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch b/queue-4.19/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
deleted file mode 100644 (file)
index d28fdc1..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6cf0a0eccfa292bf07b8ad1acc02bb38502a5e24 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Jul 2019 16:39:31 -0700
-Subject: ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit 25a09ce79639a8775244808c17282c491cff89cf ]
-
-Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"),
-which was merged through the crypto tree for v5.3, changed ppp_mppe.c to
-use the new arc4_crypt() library function rather than access RC4 through
-the dynamic crypto_skcipher API.
-
-Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was
-merged through the net tree and added a module soft-dependency on "arc4".
-
-The latter commit no longer makes sense because the code now uses the
-"libarc4" module rather than "arc4", and also due to the direct use of
-arc4_crypt(), no module soft-dependency is required.
-
-So revert the latter commit.
-
-Cc: Takashi Iwai <tiwai@suse.de>
-Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ppp/ppp_mppe.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
-index 8609c1a0777b..a205750b431b 100644
---- a/drivers/net/ppp/ppp_mppe.c
-+++ b/drivers/net/ppp/ppp_mppe.c
-@@ -63,7 +63,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@fcusack.com>");
- MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
--MODULE_SOFTDEP("pre: arc4");
- MODULE_VERSION("1.0.2");
- static unsigned int
--- 
-2.25.1
-
index be9ed6376d22ab1d77a9f7f54cd006777471c19f..1c1c130eb045ccf5aff84beed18fa485fd2c615a 100644 (file)
@@ -53,7 +53,6 @@ libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch
 libnvdimm-btt-fix-lba-masking-during-free-list-popul.patch
 staging-most-core-replace-strcpy-by-strscpy.patch
 thunderbolt-drop-duplicated-get_switch_at_route.patch
-ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
 media-fdp1-fix-r-car-m3-n-naming-in-debug-message.patch
 edac-ghes-use-cper-module-handles-to-locate-dimms.patch
 edac-ghes-fix-locking-and-memory-barrier-issues.patch
diff --git a/queue-4.4/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch b/queue-4.4/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
deleted file mode 100644 (file)
index 1c46710..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 68b75523d457e9c5a4c5e7ced20580e9964f1403 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Jul 2019 16:39:31 -0700
-Subject: ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit 25a09ce79639a8775244808c17282c491cff89cf ]
-
-Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"),
-which was merged through the crypto tree for v5.3, changed ppp_mppe.c to
-use the new arc4_crypt() library function rather than access RC4 through
-the dynamic crypto_skcipher API.
-
-Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was
-merged through the net tree and added a module soft-dependency on "arc4".
-
-The latter commit no longer makes sense because the code now uses the
-"libarc4" module rather than "arc4", and also due to the direct use of
-arc4_crypt(), no module soft-dependency is required.
-
-So revert the latter commit.
-
-Cc: Takashi Iwai <tiwai@suse.de>
-Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ppp/ppp_mppe.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
-index 6376edd89ceb..05005c660d4d 100644
---- a/drivers/net/ppp/ppp_mppe.c
-+++ b/drivers/net/ppp/ppp_mppe.c
-@@ -62,7 +62,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@fcusack.com>");
- MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
--MODULE_SOFTDEP("pre: arc4");
- MODULE_VERSION("1.0.2");
- static unsigned int
--- 
-2.25.1
-
index 6b47f3a5a4ffa48920918079890997a846a38123..8759e3647c49b9ae4e0b96ea176f33257eaf905b 100644 (file)
@@ -31,6 +31,5 @@ alsa-pcm-fix-incorrect-hw_base-increase.patch
 ext4-lock-the-xattr-block-before-checksuming-it.patch
 platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch
 libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch
-ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
 edac-ghes-use-cper-module-handles-to-locate-dimms.patch
 revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch
diff --git a/queue-4.9/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch b/queue-4.9/ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
deleted file mode 100644 (file)
index e915d59..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From a8e46f1e0a99e8c924b5bf62c8dea0853511793b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Jul 2019 16:39:31 -0700
-Subject: ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit 25a09ce79639a8775244808c17282c491cff89cf ]
-
-Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"),
-which was merged through the crypto tree for v5.3, changed ppp_mppe.c to
-use the new arc4_crypt() library function rather than access RC4 through
-the dynamic crypto_skcipher API.
-
-Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was
-merged through the net tree and added a module soft-dependency on "arc4".
-
-The latter commit no longer makes sense because the code now uses the
-"libarc4" module rather than "arc4", and also due to the direct use of
-arc4_crypt(), no module soft-dependency is required.
-
-So revert the latter commit.
-
-Cc: Takashi Iwai <tiwai@suse.de>
-Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ppp/ppp_mppe.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c
-index 92f52a73ec0e..f60f7660b451 100644
---- a/drivers/net/ppp/ppp_mppe.c
-+++ b/drivers/net/ppp/ppp_mppe.c
-@@ -63,7 +63,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@fcusack.com>");
- MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
--MODULE_SOFTDEP("pre: arc4");
- MODULE_VERSION("1.0.2");
- static unsigned int
--- 
-2.25.1
-
index 5b799534e8483f9d069c4c51a996bd8e5bbe9a75..6bb3942a579c05acac87beddc3f34d51b6e9657d 100644 (file)
@@ -53,7 +53,6 @@ x86-uaccess-ubsan-fix-ubsan-vs.-smap.patch
 ubsan-build-ubsan.c-more-conservatively.patch
 platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch
 libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch
-ppp-mppe-revert-ppp-mppe-add-softdep-to-arc4.patch
 edac-ghes-use-cper-module-handles-to-locate-dimms.patch
 cxgb4-free-mac_hlist-properly.patch
 cxgb4-cxgb4vf-fix-mac_hlist-initialization-and-free.patch