[dpdk-stable] patch 'net/mlx5: remove unused includes' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 17af797b96e2a8fc8bb7c1d6d23d811325d2719e Mon Sep 17 00:00:00 2001
From: Ophir Munk <ophirmu at mellanox.com>
Date: Tue, 25 Aug 2020 09:31:08 +0000
Subject: [PATCH] net/mlx5: remove unused includes

[ upstream commit f2e8b4556f89f8bb940612bfad5602801b5715e4 ]

Remove unused Linux included files:

<sys/ioctl.h>, <arpa/inet.h> from file net/mlx5/mlx5_mac.c
<sys/mman.h> from file net/mlx5/mlx5.c

Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters")

Signed-off-by: Ophir Munk <ophirmu at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5.c     | 1 -
 drivers/net/mlx5/mlx5_mac.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index ad1ff8dba1..88ed5ffa5c 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <net/if.h>
 #include <fcntl.h>
-#include <sys/mman.h>
 #include <linux/rtnetlink.h>
 
 /* Verbs header. */
diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
index 94f102d8a1..177871b211 100644
--- a/drivers/net/mlx5/mlx5_mac.c
+++ b/drivers/net/mlx5/mlx5_mac.c
@@ -11,7 +11,6 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
-#include <arpa/inet.h>
 
 /* Verbs header. */
 /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.009802105 +0000
+++ 0007-net-mlx5-remove-unused-includes.patch	2020-10-28 10:35:11.400828492 +0000
@@ -1,48 +1,48 @@
-From f2e8b4556f89f8bb940612bfad5602801b5715e4 Mon Sep 17 00:00:00 2001
+From 17af797b96e2a8fc8bb7c1d6d23d811325d2719e Mon Sep 17 00:00:00 2001
 From: Ophir Munk <ophirmu at mellanox.com>
 Date: Tue, 25 Aug 2020 09:31:08 +0000
 Subject: [PATCH] net/mlx5: remove unused includes
 
+[ upstream commit f2e8b4556f89f8bb940612bfad5602801b5715e4 ]
+
 Remove unused Linux included files:
 
 <sys/ioctl.h>, <arpa/inet.h> from file net/mlx5/mlx5_mac.c
 <sys/mman.h> from file net/mlx5/mlx5.c
 
 Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ophir Munk <ophirmu at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
 ---
  drivers/net/mlx5/mlx5.c     | 1 -
- drivers/net/mlx5/mlx5_mac.c | 2 --
- 2 files changed, 3 deletions(-)
+ drivers/net/mlx5/mlx5_mac.c | 1 -
+ 2 files changed, 2 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
-index b099b23c3d..ca60926399 100644
+index ad1ff8dba1..88ed5ffa5c 100644
 --- a/drivers/net/mlx5/mlx5.c
 +++ b/drivers/net/mlx5/mlx5.c
-@@ -9,7 +9,6 @@
- #include <stdint.h>
- #include <stdlib.h>
+@@ -13,7 +13,6 @@
  #include <errno.h>
+ #include <net/if.h>
+ #include <fcntl.h>
 -#include <sys/mman.h>
  #include <linux/rtnetlink.h>
  
- #include <rte_malloc.h>
+ /* Verbs header. */
 diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c
-index 88c52b29f4..bd786fd638 100644
+index 94f102d8a1..177871b211 100644
 --- a/drivers/net/mlx5/mlx5_mac.c
 +++ b/drivers/net/mlx5/mlx5_mac.c
-@@ -9,8 +9,6 @@
- #include <inttypes.h>
+@@ -11,7 +11,6 @@
  #include <errno.h>
  #include <netinet/in.h>
--#include <sys/ioctl.h>
+ #include <sys/ioctl.h>
 -#include <arpa/inet.h>
  
- #include <rte_ether.h>
- #include <rte_ethdev_driver.h>
+ /* Verbs header. */
+ /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
 -- 
 2.20.1