From: Greg Kroah-Hartman Date: Tue, 20 Apr 2021 07:34:24 +0000 (+0200) Subject: drop net-tipc-fix-spelling-errors-in-net-tipc-module.patch X-Git-Tag: v5.4.114~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53da6ed12369cb3674cc6536a0a5e88c7e83facd;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-tipc-fix-spelling-errors-in-net-tipc-module.patch --- diff --git a/queue-4.14/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-4.14/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 6e5a5d64701..00000000000 --- a/queue-4.14/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 440c3a39236b31cef32390c332fb7994319222ed Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index 42d6eeeb646d..1a207b2d6d5c 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -146,9 +146,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index 719c5924b638..76a43ac45e31 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -88,7 +88,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index 82f8f69f4d6b..1c8a9c29a6df 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1223,7 +1223,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index e9fe996d9fa..5359adec1e7 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -15,7 +15,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch input-i8042-fix-pegatron-c15b-id-entry.patch hid-wacom-set-ev_key-and-ev_abs-only-for-non-hid_generic-type-of-devices.patch diff --git a/queue-4.19/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-4.19/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 74f84aac66e..00000000000 --- a/queue-4.19/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 406a895f9ed259e2882e7b19cf1e1bf2a40c4daa Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index 394290cbbb1d..00bf28a65057 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -149,9 +149,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index 2e2e938fe4b7..18bcf2393afe 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -89,7 +89,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index a188c2590137..201ef25fb30b 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1406,7 +1406,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 46f6e7bb4ef..035d00ef97e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -19,7 +19,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch input-s6sy761-fix-coordinate-read-bit-shift.patch input-i8042-fix-pegatron-c15b-id-entry.patch diff --git a/queue-4.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-4.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 99850ef1001..00000000000 --- a/queue-4.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5387243a93b508719b81724cd629638d16deb811 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index 5f11e18b1fa1..1e180d512ef2 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -153,9 +153,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index 2763bd369b79..f874f95b6b93 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -93,7 +93,7 @@ static const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = { - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index 2df0b98d4a32..772794e5dd02 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1052,7 +1052,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-4.4/series b/queue-4.4/series index e2e336cf89e..db23bb39739 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -14,7 +14,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch input-i8042-fix-pegatron-c15b-id-entry.patch scsi-libsas-reset-num_scatter-if-libata-marks-qc-as-nodata.patch net-davicom-fix-regulator-not-turned-off-on-failed-probe.patch diff --git a/queue-4.9/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-4.9/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 6a8a6a5a27c..00000000000 --- a/queue-4.9/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ba963fd2b7f0839283fc9a1a347d1a748d31436b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index 278ff7f616f9..eff1667f3748 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -140,9 +140,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index ab8a2d5d1e32..6a2c91f34703 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -88,7 +88,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index fe7b0ad1d6f3..94738a1c67e8 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1223,7 +1223,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index e62fabb7453..7541d3a1b02 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -14,7 +14,6 @@ net-ieee802154-forbid-monitor-for-add-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch input-i8042-fix-pegatron-c15b-id-entry.patch scsi-libsas-reset-num_scatter-if-libata-marks-qc-as-nodata.patch net-davicom-fix-regulator-not-turned-off-on-failed-probe.patch diff --git a/queue-5.10/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-5.10/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 54ffdbfd058..00000000000 --- a/queue-5.10/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6b9d6797202810e9da645da4c50fd3a88d470c04 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index bc0023119da2..9700c7df1b7f 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -150,9 +150,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index 0bb2323201da..04ba69a0768b 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -89,7 +89,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index e4452d55851f..10b6fa7e558e 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1711,7 +1711,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index c8515f1969f..077edaa7aed 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -39,7 +39,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch virt_wifi-return-micros-for-bss-tsf-values.patch lib-fix-kconfig-dependency-on-arch_want_frame_pointe.patch diff --git a/queue-5.11/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-5.11/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 0dbf398cd77..00000000000 --- a/queue-5.11/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 521fbd72eeb2eb40d310291515c6b65137896500 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index 6bf4550aa1ac..57c6a1a719e2 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -154,9 +154,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index a129f661bee3..faf6bf554514 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -89,7 +89,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index 136338b85504..e0ee83263a39 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1734,7 +1734,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-5.11/series b/queue-5.11/series index e41b9a2ca1a..3b18717bce0 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -46,7 +46,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch drm-amd-display-add-missing-mask-for-dcn3.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch virt_wifi-return-micros-for-bss-tsf-values.patch diff --git a/queue-5.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch b/queue-5.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch deleted file mode 100644 index 63a71b99d45..00000000000 --- a/queue-5.4/net-tipc-fix-spelling-errors-in-net-tipc-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0ab429dae48c96c5235d8326c566fd5de49f6abc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 7 Apr 2021 09:59:45 +0800 -Subject: net: tipc: Fix spelling errors in net/tipc module - -From: Zheng Yongjun - -[ Upstream commit a79ace4b312953c5835fafb12adc3cb6878b26bd ] - -These patches fix a series of spelling errors in net/tipc module. - -Reported-by: Hulk Robot -Signed-off-by: Zheng Yongjun -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - net/tipc/bearer.h | 6 +++--- - net/tipc/net.c | 2 +- - net/tipc/node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h -index ea0f3c49cbed..a7b4cf66dfc2 100644 ---- a/net/tipc/bearer.h -+++ b/net/tipc/bearer.h -@@ -149,9 +149,9 @@ struct tipc_media { - * care of initializing all other fields. - */ - struct tipc_bearer { -- void __rcu *media_ptr; /* initalized by media */ -- u32 mtu; /* initalized by media */ -- struct tipc_media_addr addr; /* initalized by media */ -+ void __rcu *media_ptr; /* initialized by media */ -+ u32 mtu; /* initialized by media */ -+ struct tipc_media_addr addr; /* initialized by media */ - char name[TIPC_MAX_BEARER_NAME]; - struct tipc_media *media; - struct tipc_media_addr bcast_addr; -diff --git a/net/tipc/net.c b/net/tipc/net.c -index 2498ce8b83c1..2600be4b0d89 100644 ---- a/net/tipc/net.c -+++ b/net/tipc/net.c -@@ -89,7 +89,7 @@ - * - A spin lock to protect the registry of kernel/driver users (reg.c) - * - A global spin_lock (tipc_port_lock), which only task is to ensure - * consistency where more than one port is involved in an operation, -- * i.e., whe a port is part of a linked list of ports. -+ * i.e., when a port is part of a linked list of ports. - * There are two such lists; 'port_list', which is used for management, - * and 'wait_list', which is used to queue ports during congestion. - * -diff --git a/net/tipc/node.c b/net/tipc/node.c -index c8f6177dd5a2..47f7c8e856c6 100644 ---- a/net/tipc/node.c -+++ b/net/tipc/node.c -@@ -1482,7 +1482,7 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, - } - - /* tipc_node_xmit_skb(): send single buffer to destination -- * Buffers sent via this functon are generally TIPC_SYSTEM_IMPORTANCE -+ * Buffers sent via this function are generally TIPC_SYSTEM_IMPORTANCE - * messages, which will not be rejected - * The only exception is datagram messages rerouted after secondary - * lookup, which are rare and safe to dispose of anyway. --- -2.30.2 - diff --git a/queue-5.4/series b/queue-5.4/series index f5c5cf72282..24890331691 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -33,7 +33,6 @@ net-ieee802154-forbid-monitor-for-del-llsec-devkey.patch net-ieee802154-stop-dump-llsec-seclevels-for-monitor.patch net-ieee802154-forbid-monitor-for-add-llsec-seclevel.patch pcnet32-use-pci_resource_len-to-validate-pci-resourc.patch -net-tipc-fix-spelling-errors-in-net-tipc-module.patch mac80211-clear-sta-fast_rx-when-sta-removed-from-4-a.patch virt_wifi-return-micros-for-bss-tsf-values.patch input-s6sy761-fix-coordinate-read-bit-shift.patch