Drop net-loopback-use-net_name_predictable-for-name_assig.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-4.14/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 3dd124a..0000000
--- a/queue-4.14/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c7d9ed4ca22f619061f14e3b2b99dbaec0ec1955 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index 30612497643c..daef41ce2349 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -206,7 +206,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 85ac86a0bc0574e3d8e24d3987cd654d7464de66..02ce1e29c2014ba85c60cce562b9327496bf8174 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -7,4 +7,3 @@ nfp-fix-use-after-free-in-area_cache_get.patch
 asoc-ops-check-bounds-for-second-channel-in-snd_soc_.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch

diff --git a/queue-4.19/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-4.19/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index edbb98a..0000000
--- a/queue-4.19/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7bb8ba1f4b99cb06a42cba9d4972e877a4adc1e1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index d192936b76cf..7863918592db 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -210,7 +210,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 874a7c952a9c1f8392aceec188806f05812c65a2..b7e662d5bc60f5318f1a7b7e82ed7bd257014f2a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -6,4 +6,3 @@ asoc-ops-check-bounds-for-second-channel-in-snd_soc_.patch
 pinctrl-meditatek-startup-with-the-irqs-disabled.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch

diff --git a/queue-4.9/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-4.9/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 9d6639c..0000000
--- a/queue-4.9/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c5e2c0da142613b20323b8a4029bf63f8a04bcb4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index 1b65f0f975cf..f04f9a87840e 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -194,7 +194,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index b7f64ff9dde889acedd6cfaf6d4879a9696fb302..a4c1d97fe652c0f5f6cc170ef0c536178a851b37 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -3,4 +3,3 @@ mm-khugepaged-invoke-mmu-notifiers-in-shmem-file-collapse-paths.patch
 block-unhash-blkdev-part-inode-when-the-part-is-deleted.patch
 asoc-ops-check-bounds-for-second-channel-in-snd_soc_.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch

diff --git a/queue-5.10/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-5.10/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 5bcfe85..0000000
--- a/queue-5.10/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d923a2750a9bcf9b35c2c3fba12a9f20a339653a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index a1c77cc00416..498e5c8013ef 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -208,7 +208,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index a7279a5d706e32059f63e04df9520e0f865a7446..73ada19bf3236dd70cbca405de22dcc12c594379 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -11,6 +11,5 @@ libbpf-use-page-size-as-max_entries-when-probing-rin.patch
 pinctrl-meditatek-startup-with-the-irqs-disabled.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch
 asoc-cs42l51-correct-pga-volume-minimum-value.patch
 nvme-pci-clear-the-prp2-field-when-not-used.patch

diff --git a/queue-5.15/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-5.15/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 581a39c..0000000
--- a/queue-5.15/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bc3f35b00fd13e632eb05b76a8d95a0d8ca601c0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index a1c77cc00416..498e5c8013ef 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -208,7 +208,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 50717484b08f2ba4d4e1290684ac5dafa394fefe..d8fc01ad18e907e1bd26607bf926bf949f851426 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -9,7 +9,6 @@ pinctrl-meditatek-startup-with-the-irqs-disabled.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
 net-fec-don-t-reset-irq-coalesce-settings-to-default.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch
 asoc-cs42l51-correct-pga-volume-minimum-value.patch
 perf-fix-perf_pending_task-uaf.patch
 nvme-pci-clear-the-prp2-field-when-not-used.patch

diff --git a/queue-5.4/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-5.4/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 0da1204..0000000
--- a/queue-5.4/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd95408243ab72688b1c4121ce6e488fb2582584 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index 14545a8797a8..7788f72c262e 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -206,7 +206,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index e9e81c9a8f52f570eda1c2af106f5dc3d6de97a2..aad63bfbda5fbc93efe83dddd5fdebed6f349dda 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -7,4 +7,3 @@ asoc-ops-check-bounds-for-second-channel-in-snd_soc_.patch
 pinctrl-meditatek-startup-with-the-irqs-disabled.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch

diff --git a/queue-6.0/net-loopback-use-net_name_predictable-for-name_assig.patch b/queue-6.0/net-loopback-use-net_name_predictable-for-name_assig.patch
deleted file mode 100644 (file)
index 04985ba..0000000
--- a/queue-6.0/net-loopback-use-net_name_predictable-for-name_assig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fa4bf0c84668bf742839a163733332eeb7b1cd81 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Nov 2022 15:18:28 +0100
-Subject: net: loopback: use NET_NAME_PREDICTABLE for name_assign_type
-
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-
-[ Upstream commit 31d929de5a112ee1b977a89c57de74710894bbbf ]
-
-When the name_assign_type attribute was introduced (commit
-685343fc3ba6, "net: add name_assign_type netdev attribute"), the
-loopback device was explicitly mentioned as one which would make use
-of NET_NAME_PREDICTABLE:
-
-    The name_assign_type attribute gives hints where the interface name of a
-    given net-device comes from. These values are currently defined:
-...
-      NET_NAME_PREDICTABLE:
-        The ifname has been assigned by the kernel in a predictable way
-        that is guaranteed to avoid reuse and always be the same for a
-        given device. Examples include statically created devices like
-        the loopback device [...]
-
-Switch to that so that reading /sys/class/net/lo/name_assign_type
-produces something sensible instead of returning -EINVAL.
-
-Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/loopback.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
-index 14e8d04cb434..2e9742952c4e 100644
---- a/drivers/net/loopback.c
-+++ b/drivers/net/loopback.c
-@@ -211,7 +211,7 @@ static __net_init int loopback_net_init(struct net *net)
-       int err;
- 
-       err = -ENOMEM;
--      dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup);
-+      dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup);
-       if (!dev)
-               goto out;
- 
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index e6ceec67d758421640b12896701fbdb2695e47b1..22f60ee75c3393b9324398701a66175db23cc8f1 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -11,7 +11,6 @@ pinctrl-meditatek-startup-with-the-irqs-disabled.patch
 can-sja1000-fix-size-of-ocr_mode_mask-define.patch
 can-mcba_usb-fix-termination-command-argument.patch
 net-fec-don-t-reset-irq-coalesce-settings-to-default.patch
-net-loopback-use-net_name_predictable-for-name_assig.patch
 asoc-cs42l51-correct-pga-volume-minimum-value.patch
 perf-fix-perf_pending_task-uaf.patch
 nvme-pci-clear-the-prp2-field-when-not-used.patch