From: Greg Kroah-Hartman Date: Tue, 19 Nov 2019 17:01:37 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.3.12~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ce7ea509e004e774afbeabc887ed3cf933a9d55;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: net-devlink-select-net_devlink-from-drivers.patch --- diff --git a/queue-4.19/net-devlink-select-net_devlink-from-drivers.patch b/queue-4.19/net-devlink-select-net_devlink-from-drivers.patch new file mode 100644 index 00000000000..8b7b424558a --- /dev/null +++ b/queue-4.19/net-devlink-select-net_devlink-from-drivers.patch @@ -0,0 +1,61 @@ +From f6b19b354d50c5ae46ad66b5273f92e563fbc847 Mon Sep 17 00:00:00 2001 +From: Jiri Pirko +Date: Sun, 24 Mar 2019 11:14:38 +0100 +Subject: net: devlink: select NET_DEVLINK from drivers + +From: Jiri Pirko + +commit f6b19b354d50c5ae46ad66b5273f92e563fbc847 upstream. + +Some drivers are becoming more dependent on NET_DEVLINK being selected +in configuration. With upcoming compat functions, the behavior would be +wrong in case devlink was not compiled in. So make the drivers select +NET_DEVLINK and rely on the functions being there, not just stubs. + +Signed-off-by: Jiri Pirko +Signed-off-by: David S. Miller +[only backport 3 select NET_DEVLINK lines of original patch, to resolve + build issues - gregkh] +Cc: Guenter Roeck +Cc: Chris Paterson +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/mellanox/mlx4/Kconfig ++++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig +@@ -27,6 +27,7 @@ config MLX4_EN_DCB + config MLX4_CORE + tristate + depends on PCI ++ select NET_DEVLINK + default n + + config MLX4_DEBUG +--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig ++++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +@@ -4,8 +4,8 @@ + + config MLX5_CORE + tristate "Mellanox 5th generation network adapters (ConnectX series) core driver" +- depends on MAY_USE_DEVLINK + depends on PCI ++ select NET_DEVLINK + imply PTP_1588_CLOCK + imply VXLAN + imply MLXFW +--- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig ++++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig +@@ -4,7 +4,7 @@ + + config MLXSW_CORE + tristate "Mellanox Technologies Switch ASICs support" +- depends on MAY_USE_DEVLINK ++ select NET_DEVLINK + ---help--- + This driver supports Mellanox Technologies Switch ASICs family. + diff --git a/queue-4.19/series b/queue-4.19/series index 2be13ba1746..2bc732b7660 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -7,6 +7,7 @@ net-gemini-add-missed-free_netdev.patch net-usb-qmi_wwan-add-support-for-foxconn-t77w968-lte-modules.patch slip-fix-memory-leak-in-slip_open-error-path.patch devlink-disallow-reload-operation-during-device-cleanup.patch +net-devlink-select-net_devlink-from-drivers.patch alsa-usb-audio-fix-missing-error-check-at-mixer-resolution-test.patch alsa-usb-audio-not-submit-urb-for-stopped-endpoint.patch alsa-usb-audio-fix-incorrect-null-check-in-create_yamaha_midi_quirk.patch