drop appletalk patch from trees it was already released in

diff --git a/queue-5.4/appletalk-fix-atalk_proc_init-return-path.patch b/queue-5.4/appletalk-fix-atalk_proc_init-return-path.patch
deleted file mode 100644 (file)
index 39000e7..0000000
--- a/queue-5.4/appletalk-fix-atalk_proc_init-return-path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d0f6ba2ef2c1c95069509e71402e7d6d43452512 Mon Sep 17 00:00:00 2001
-From: Vincent Duvert <vincent.ldev@duvert.net>
-Date: Sun, 2 Aug 2020 07:06:51 +0200
-Subject: appletalk: Fix atalk_proc_init() return path
-
-From: Vincent Duvert <vincent.ldev@duvert.net>
-
-commit d0f6ba2ef2c1c95069509e71402e7d6d43452512 upstream.
-
-Add a missing return statement to atalk_proc_init so it doesn't return
--ENOMEM when successful.  This allows the appletalk module to load
-properly.
-
-Fixes: e2bcd8b0ce6e ("appletalk: use remove_proc_subtree to simplify procfs code")
-Link: https://www.downtowndougbrown.com/2020/08/hacking-up-a-fix-for-the-broken-appletalk-kernel-module-in-linux-5-1-and-newer/
-Reported-by: Christopher KOBAYASHI <chris@disavowed.jp>
-Reported-by: Doug Brown <doug@downtowndougbrown.com>
-Signed-off-by: Vincent Duvert <vincent.ldev@duvert.net>
-[lukas: add missing tags]
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v5.1+
-Cc: Yue Haibing <yuehaibing@huawei.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/appletalk/atalk_proc.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/appletalk/atalk_proc.c
-+++ b/net/appletalk/atalk_proc.c
-@@ -231,6 +231,8 @@ int __init atalk_proc_init(void)
- 
-       return 0;
- 
-+      return 0;
-+
- out:
-       remove_proc_subtree("atalk", init_net.proc_net);
-       return -ENOMEM;

diff --git a/queue-5.4/iio-imu-st_lsm6dsx-reset-hw-ts-after-resume.patch b/queue-5.4/iio-imu-st_lsm6dsx-reset-hw-ts-after-resume.patch
deleted file mode 100644 (file)
index 6374f90..0000000
--- a/queue-5.4/iio-imu-st_lsm6dsx-reset-hw-ts-after-resume.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a1bab9396c2d98c601ce81c27567159dfbc10c19 Mon Sep 17 00:00:00 2001
-From: Lorenzo Bianconi <lorenzo@kernel.org>
-Date: Mon, 13 Jul 2020 13:40:19 +0200
-Subject: iio: imu: st_lsm6dsx: reset hw ts after resume
-
-From: Lorenzo Bianconi <lorenzo@kernel.org>
-
-commit a1bab9396c2d98c601ce81c27567159dfbc10c19 upstream.
-
-Reset hw time samples generator after system resume in order to avoid
-disalignment between system and device time reference since FIFO
-batching and time samples generator are disabled during suspend.
-
-Fixes: 213451076bd3 ("iio: imu: st_lsm6dsx: add hw timestamp support")
-Tested-by: Sean Nyekjaer <sean@geanix.com>
-Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
-index d82ec6398222..d80ba2e688ed 100644
---- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
-+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
-@@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor,
-                               u16 watermark);
- int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable);
- int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw);
--int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
--                           enum st_lsm6dsx_fifo_mode fifo_mode);
-+int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw);
- int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw);
- int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw);
- int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u32 odr, u8 *val);
-diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
-index afd00daeefb2..7de10bd636ea 100644
---- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
-+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
-@@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
-       return err;
- }
- 
--int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
--                           enum st_lsm6dsx_fifo_mode fifo_mode)
-+static int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
-+                                  enum st_lsm6dsx_fifo_mode fifo_mode)
- {
-       unsigned int data;
- 
-@@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw)
-       return 0;
- }
- 
-+int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw)
-+{
-+      int err;
-+
-+      /* reset hw ts counter */
-+      err = st_lsm6dsx_reset_hw_ts(hw);
-+      if (err < 0)
-+              return err;
-+
-+      return st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT);
-+}
-+
- /*
-  * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN
-  * in order to avoid a kmalloc for each bus access
-@@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable)
-               goto out;
- 
-       if (fifo_mask) {
--              /* reset hw ts counter */
--              err = st_lsm6dsx_reset_hw_ts(hw);
--              if (err < 0)
--                      goto out;
--
--              err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT);
-+              err = st_lsm6dsx_resume_fifo(hw);
-               if (err < 0)
-                       goto out;
-       }
-diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
-index c8ddeb3f48ff..346c24281d26 100644
---- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
-+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
-@@ -2457,7 +2457,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev)
-       }
- 
-       if (hw->fifo_mask)
--              err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT);
-+              err = st_lsm6dsx_resume_fifo(hw);
- 
-       return err;
- }

diff --git a/queue-5.4/series b/queue-5.4/series
index 8347c09ecb2adbbfe3002df2b87f18cdbf57e872..c7714d6a5acf954c5558ce8c4c3b7a7edff9d4c1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -45,7 +45,6 @@ md-raid5-fix-force-reconstruct-write-io-stuck-in-degraded-raid5.patch
 bcache-allocate-meta-data-pages-as-compound-pages.patch
 bcache-fix-overflow-in-offset_to_stripe.patch
 mac80211-fix-misplaced-while-instead-of-if.patch
-appletalk-fix-atalk_proc_init-return-path.patch
 driver-core-avoid-binding-drivers-to-dead-devices.patch
 mips-cpu-0-is-not-hotpluggable.patch
 mips-qi_lb60-fix-routing-to-audio-amplifier.patch
@@ -66,4 +65,3 @@ watchdog-f71808e_wdt-clear-watchdog-timeout-occurred-flag.patch
 ceph-set-sec_context-xattr-on-symlink-creation.patch
 ceph-handle-zero-length-feature-mask-in-session-messages.patch
 pseries-fix-64-bit-logical-memory-block-panic.patch
-iio-imu-st_lsm6dsx-reset-hw-ts-after-resume.patch

diff --git a/queue-5.7/appletalk-fix-atalk_proc_init-return-path.patch b/queue-5.7/appletalk-fix-atalk_proc_init-return-path.patch
deleted file mode 100644 (file)
index 39000e7..0000000
--- a/queue-5.7/appletalk-fix-atalk_proc_init-return-path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d0f6ba2ef2c1c95069509e71402e7d6d43452512 Mon Sep 17 00:00:00 2001
-From: Vincent Duvert <vincent.ldev@duvert.net>
-Date: Sun, 2 Aug 2020 07:06:51 +0200
-Subject: appletalk: Fix atalk_proc_init() return path
-
-From: Vincent Duvert <vincent.ldev@duvert.net>
-
-commit d0f6ba2ef2c1c95069509e71402e7d6d43452512 upstream.
-
-Add a missing return statement to atalk_proc_init so it doesn't return
--ENOMEM when successful.  This allows the appletalk module to load
-properly.
-
-Fixes: e2bcd8b0ce6e ("appletalk: use remove_proc_subtree to simplify procfs code")
-Link: https://www.downtowndougbrown.com/2020/08/hacking-up-a-fix-for-the-broken-appletalk-kernel-module-in-linux-5-1-and-newer/
-Reported-by: Christopher KOBAYASHI <chris@disavowed.jp>
-Reported-by: Doug Brown <doug@downtowndougbrown.com>
-Signed-off-by: Vincent Duvert <vincent.ldev@duvert.net>
-[lukas: add missing tags]
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v5.1+
-Cc: Yue Haibing <yuehaibing@huawei.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/appletalk/atalk_proc.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/appletalk/atalk_proc.c
-+++ b/net/appletalk/atalk_proc.c
-@@ -231,6 +231,8 @@ int __init atalk_proc_init(void)
- 
-       return 0;
- 
-+      return 0;
-+
- out:
-       remove_proc_subtree("atalk", init_net.proc_net);
-       return -ENOMEM;

diff --git a/queue-5.7/series b/queue-5.7/series
index e5fab8da6eec12b0e381aa380eee4e088cd440b3..d24697a471105185539699a417088e87446c4433 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -59,7 +59,6 @@ md-raid5-fix-force-reconstruct-write-io-stuck-in-degraded-raid5.patch
 bcache-allocate-meta-data-pages-as-compound-pages.patch
 bcache-fix-overflow-in-offset_to_stripe.patch
 mac80211-fix-misplaced-while-instead-of-if.patch
-appletalk-fix-atalk_proc_init-return-path.patch
 driver-core-avoid-binding-drivers-to-dead-devices.patch
 mips-cpu-0-is-not-hotpluggable.patch
 mips-qi_lb60-fix-routing-to-audio-amplifier.patch