drop ib patch

diff --git a/queue-3.18/ib-nes-fix-a-compiler-warning.patch b/queue-3.18/ib-nes-fix-a-compiler-warning.patch
deleted file mode 100644 (file)
index e2d8184..0000000
--- a/queue-3.18/ib-nes-fix-a-compiler-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Mon Sep 24 09:22:32 CEST 2018
-From: Bart Van Assche <bart.vanassche@wdc.com>
-Date: Thu, 5 Jul 2018 10:51:35 -0700
-Subject: IB/nes: Fix a compiler warning
-
-From: Bart Van Assche <bart.vanassche@wdc.com>
-
-[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
-
-Avoid that the following compiler warning is reported when building with
-W=1:
-
-drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
-
-Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -156,7 +156,7 @@ do { \
- 
- #define NES_EVENT_TIMEOUT   1200000
- #else
--#define nes_debug(level, fmt, args...)
-+#define nes_debug(level, fmt, args...) do {} while (0)
- #define assert(expr)          do {} while (0)
- 
- #define NES_EVENT_TIMEOUT   100000

diff --git a/queue-3.18/series b/queue-3.18/series
index 4e4a11050067fbbd569604947a31a5d5c137d33b..30b7b23748eb39069d4ac2d14a7d4672ac7cf2b6 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -101,5 +101,4 @@ parport-sunbpp-fix-error-return-code.patch
 rtc-bq4802-add-error-handling-for-devm_ioremap.patch
 alsa-pcm-fix-snd_interval_refine-first-last-with-open-min-max.patch
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
-ib-nes-fix-a-compiler-warning.patch
 usb-serial-ti_usb_3410_5052-fix-array-underflow-in-completion-handler.patch

diff --git a/queue-4.14/ib-nes-fix-a-compiler-warning.patch b/queue-4.14/ib-nes-fix-a-compiler-warning.patch
deleted file mode 100644 (file)
index 2f590c6..0000000
--- a/queue-4.14/ib-nes-fix-a-compiler-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Mon Sep 24 09:35:12 CEST 2018
-From: Bart Van Assche <bart.vanassche@wdc.com>
-Date: Thu, 5 Jul 2018 10:51:35 -0700
-Subject: IB/nes: Fix a compiler warning
-
-From: Bart Van Assche <bart.vanassche@wdc.com>
-
-[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
-
-Avoid that the following compiler warning is reported when building with
-W=1:
-
-drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
-
-Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -159,7 +159,7 @@ do { \
- 
- #define NES_EVENT_TIMEOUT   1200000
- #else
--#define nes_debug(level, fmt, args...)
-+#define nes_debug(level, fmt, args...) do {} while (0)
- #define assert(expr)          do {} while (0)
- 
- #define NES_EVENT_TIMEOUT   100000

diff --git a/queue-4.14/series b/queue-4.14/series
index 1c0298cd015411c230af7c4b1be644b021a5736f..7c2dc0f5289a5c727b582e30c0b38f105a7be008 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -149,7 +149,6 @@ alsa-pcm-fix-snd_interval_refine-first-last-with-open-min-max.patch
 scsi-libfc-fixup-sleeping-function-called-from-invalid-context.patch
 selftest-timers-tweak-raw_skew-to-skip-when-adj_offset-other-clock-adjustments-are-in-progress.patch
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
-ib-nes-fix-a-compiler-warning.patch
 blk-mq-only-attempt-to-merge-bio-if-there-is-rq-in-sw-queue.patch
 blk-mq-avoid-to-synchronize-rcu-inside-blk_cleanup_queue.patch
 gpiolib-respect-error-code-of-get_direction.patch

diff --git a/queue-4.18/ib-nes-fix-a-compiler-warning.patch b/queue-4.18/ib-nes-fix-a-compiler-warning.patch
deleted file mode 100644 (file)
index ce5f4b0..0000000
--- a/queue-4.18/ib-nes-fix-a-compiler-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Mon Sep 24 09:45:39 CEST 2018
-From: Bart Van Assche <bart.vanassche@wdc.com>
-Date: Thu, 5 Jul 2018 10:51:35 -0700
-Subject: IB/nes: Fix a compiler warning
-
-From: Bart Van Assche <bart.vanassche@wdc.com>
-
-[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
-
-Avoid that the following compiler warning is reported when building with
-W=1:
-
-drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
-
-Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -159,7 +159,7 @@ do { \
- 
- #define NES_EVENT_TIMEOUT   1200000
- #else
--#define nes_debug(level, fmt, args...)
-+#define nes_debug(level, fmt, args...) do {} while (0)
- #define assert(expr)          do {} while (0)
- 
- #define NES_EVENT_TIMEOUT   100000

diff --git a/queue-4.18/series b/queue-4.18/series
index 25bcf9167124b2e726954702295b0b01ff60c682..e08b126f8e87a9d6967be0026c4969b0232e072f 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -220,7 +220,6 @@ arm64-perf-disable-pmu-while-processing-counter-overflows.patch
 drm-amd-pp-send-khz-clock-values-to-dc-for-smu7-8.patch
 dmaengine-sh-rcar-dmac-avoid-to-write-chcr.te-to-1-if-tcr-is-set-to-0.patch
 staging-fsl-dpaa2-eth-fix-dma-mapping-direction.patch
-ib-nes-fix-a-compiler-warning.patch
 block-dac960.c-fix-defined-but-not-used-build-warnings.patch
 ib-mlx5-fix-uaccess-beyond-count-in-debugfs-read-write-handlers.patch
 blk-mq-only-attempt-to-merge-bio-if-there-is-rq-in-sw-queue.patch

diff --git a/queue-4.4/ib-nes-fix-a-compiler-warning.patch b/queue-4.4/ib-nes-fix-a-compiler-warning.patch
deleted file mode 100644 (file)
index 7d5e6d6..0000000
--- a/queue-4.4/ib-nes-fix-a-compiler-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Mon Sep 24 09:26:11 CEST 2018
-From: Bart Van Assche <bart.vanassche@wdc.com>
-Date: Thu, 5 Jul 2018 10:51:35 -0700
-Subject: IB/nes: Fix a compiler warning
-
-From: Bart Van Assche <bart.vanassche@wdc.com>
-
-[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
-
-Avoid that the following compiler warning is reported when building with
-W=1:
-
-drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
-
-Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -156,7 +156,7 @@ do { \
- 
- #define NES_EVENT_TIMEOUT   1200000
- #else
--#define nes_debug(level, fmt, args...)
-+#define nes_debug(level, fmt, args...) do {} while (0)
- #define assert(expr)          do {} while (0)
- 
- #define NES_EVENT_TIMEOUT   100000

diff --git a/queue-4.4/series b/queue-4.4/series
index e9a97f1f74e91cb1245c6064d3255a38a801ec14..5ae54bf19415d123099efc260905e3b951b9af1b 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -61,7 +61,6 @@ rtc-bq4802-add-error-handling-for-devm_ioremap.patch
 alsa-pcm-fix-snd_interval_refine-first-last-with-open-min-max.patch
 selftest-timers-tweak-raw_skew-to-skip-when-adj_offset-other-clock-adjustments-are-in-progress.patch
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
-ib-nes-fix-a-compiler-warning.patch
 pinctrl-qcom-spmi-gpio-fix-pmic_gpio_config_get-to-be-compliant.patch
 usb-serial-ti_usb_3410_5052-fix-array-underflow-in-completion-handler.patch
 mei-bus-type-promotion-bug-in-mei_nfc_if_version.patch

diff --git a/queue-4.9/ib-nes-fix-a-compiler-warning.patch b/queue-4.9/ib-nes-fix-a-compiler-warning.patch
deleted file mode 100644 (file)
index 1c69e37..0000000
--- a/queue-4.9/ib-nes-fix-a-compiler-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Mon Sep 24 09:32:39 CEST 2018
-From: Bart Van Assche <bart.vanassche@wdc.com>
-Date: Thu, 5 Jul 2018 10:51:35 -0700
-Subject: IB/nes: Fix a compiler warning
-
-From: Bart Van Assche <bart.vanassche@wdc.com>
-
-[ Upstream commit 4c5743bc4fe3233cecc1c184a773c79c8ee45bbe ]
-
-Avoid that the following compiler warning is reported when building with
-W=1:
-
-drivers/infiniband/hw/nes/nes_hw.c:646:51: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
-
-Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
-Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/nes/nes.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -156,7 +156,7 @@ do { \
- 
- #define NES_EVENT_TIMEOUT   1200000
- #else
--#define nes_debug(level, fmt, args...)
-+#define nes_debug(level, fmt, args...) do {} while (0)
- #define assert(expr)          do {} while (0)
- 
- #define NES_EVENT_TIMEOUT   100000

diff --git a/queue-4.9/series b/queue-4.9/series
index c585f0a28a75507a9703a80253626a964c1e695a..08a3efefee9923302b3af4bbea10e99a80c18c08 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -96,7 +96,6 @@ rtc-bq4802-add-error-handling-for-devm_ioremap.patch
 alsa-pcm-fix-snd_interval_refine-first-last-with-open-min-max.patch
 selftest-timers-tweak-raw_skew-to-skip-when-adj_offset-other-clock-adjustments-are-in-progress.patch
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
-ib-nes-fix-a-compiler-warning.patch
 gpiolib-respect-error-code-of-get_direction.patch
 pinctrl-qcom-spmi-gpio-fix-pmic_gpio_config_get-to-be-compliant.patch
 mei-bus-type-promotion-bug-in-mei_nfc_if_version.patch