drop a 4.19 phy patch that is not needed.

diff --git a/queue-4.19/net-phy-phy-driver-features-are-mandatory.patch b/queue-4.19/net-phy-phy-driver-features-are-mandatory.patch
deleted file mode 100644 (file)
index d7020ae..0000000
--- a/queue-4.19/net-phy-phy-driver-features-are-mandatory.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From foo@baz Sat Jan 26 10:22:29 CET 2019
-From: Camelia Groza <camelia.groza@nxp.com>
-Date: Thu, 17 Jan 2019 14:22:36 +0200
-Subject: net: phy: phy driver features are mandatory
-
-From: Camelia Groza <camelia.groza@nxp.com>
-
-[ Upstream commit 3e64cf7a435ed0500e3adaa8aada2272d3ae8abc ]
-
-Since phy driver features became a link_mode bitmap, phy drivers that
-don't have a list of features configured will cause the kernel to crash
-when probed.
-
-Prevent the phy driver from registering if the features field is missing.
-
-Fixes: 719655a14971 ("net: phy: Replace phy driver features u32 with link_mode bitmap")
-Reported-by: Scott Wood <oss@buserror.net>
-Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/phy/phy_device.c |    5 +++++
- include/linux/phy.h          |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -1917,6 +1917,11 @@ int phy_driver_register(struct phy_drive
- {
-       int retval;
- 
-+      if (WARN_ON(!new_driver->features)) {
-+              pr_err("%s: Driver features are missing\n", new_driver->name);
-+              return -EINVAL;
-+      }
-+
-       new_driver->mdiodrv.flags |= MDIO_DEVICE_IS_PHY;
-       new_driver->mdiodrv.driver.name = new_driver->name;
-       new_driver->mdiodrv.driver.bus = &mdio_bus_type;
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -491,8 +491,8 @@ struct phy_device {
-  *   only works for PHYs with IDs which match this field
-  * name: The friendly name of this PHY type
-  * phy_id_mask: Defines the important bits of the phy_id
-- * features: A list of features (speed, duplex, etc) supported
-- *   by this PHY
-+ * features: A mandatory list of features (speed, duplex, etc)
-+ *   supported by this PHY
-  * flags: A bitfield defining certain other features this PHY
-  *   supports (like interrupts)
-  *

diff --git a/queue-4.19/series b/queue-4.19/series
index c10b66a60f8fedb5a5323d1eb08cfa4a9715fcfc..40d1a98e0f62e5e6a44fc43f50ab04cccdbd0f07 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -3,7 +3,6 @@ net-bridge-fix-ethernet-header-pointer-before-check-skb-forwardable.patch
 net-fix-usage-of-pskb_trim_rcsum.patch
 net-phy-marvell-errata-for-mv88e6390-internal-phys.patch
 net-phy-mdio_bus-add-missing-device_del-in-mdiobus_register-error-handling.patch
-net-phy-phy-driver-features-are-mandatory.patch
 net-sched-act_tunnel_key-fix-memory-leak-in-case-of-action-replace.patch
 net_sched-refetch-skb-protocol-for-each-filter.patch
 openvswitch-avoid-oob-read-when-parsing-flow-nlattrs.patch