drop 2 4.4 patches

diff --git a/queue-4.4/alsa-hda-hdmi-read-the-pin-sense-from-register-when-repolling.patch b/queue-4.4/alsa-hda-hdmi-read-the-pin-sense-from-register-when-repolling.patch
deleted file mode 100644 (file)
index 708f89a..0000000
--- a/queue-4.4/alsa-hda-hdmi-read-the-pin-sense-from-register-when-repolling.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8c2e6728c2bf95765b724e07d0278ae97cd1ee0d Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Mon, 6 May 2019 22:09:31 +0800
-Subject: ALSA: hda/hdmi - Read the pin sense from register when repolling
-
-From: Hui Wang <hui.wang@canonical.com>
-
-commit 8c2e6728c2bf95765b724e07d0278ae97cd1ee0d upstream.
-
-The driver will check the monitor presence when resuming from suspend,
-starting poll or interrupt triggers. In these 3 situations, the
-jack_dirty will be set to 1 first, then the hda_jack.c reads the
-pin_sense from register, after reading the register, the jack_dirty
-will be set to 0. But hdmi_repoll_work() is enabled in these 3
-situations, It will read the pin_sense a couple of times subsequently,
-since the jack_dirty is 0 now, It does not read the register anymore,
-instead it uses the shadow pin_sense which is read at the first time.
-
-It is meaningless to check the shadow pin_sense a couple of times,
-we need to read the register to check the real plugging state, so
-we set the jack_dirty to 1 in the hdmi_repoll_work().
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/pci/hda/patch_hdmi.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -2501,6 +2501,11 @@ static int simple_playback_init(struct h
- static void simple_playback_free(struct hda_codec *codec)
- {
-       struct hdmi_spec *spec = codec->spec;
-+      struct hda_jack_tbl *jack;
-+
-+      jack = snd_hda_jack_tbl_get(codec, per_pin->pin_nid);
-+      if (jack)
-+              jack->jack_dirty = 1;
- 
-       hdmi_array_free(spec);
-       kfree(spec);

diff --git a/queue-4.4/crypto-chacha20poly1305-set-cra_name-correctly.patch b/queue-4.4/crypto-chacha20poly1305-set-cra_name-correctly.patch
deleted file mode 100644 (file)
index c58fa54..0000000
--- a/queue-4.4/crypto-chacha20poly1305-set-cra_name-correctly.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5e27f38f1f3f45a0c938299c3a34a2d2db77165a Mon Sep 17 00:00:00 2001
-From: Eric Biggers <ebiggers@google.com>
-Date: Sun, 31 Mar 2019 13:04:16 -0700
-Subject: crypto: chacha20poly1305 - set cra_name correctly
-
-From: Eric Biggers <ebiggers@google.com>
-
-commit 5e27f38f1f3f45a0c938299c3a34a2d2db77165a upstream.
-
-If the rfc7539 template is instantiated with specific implementations,
-e.g. "rfc7539(chacha20-generic,poly1305-generic)" rather than
-"rfc7539(chacha20,poly1305)", then the implementation names end up
-included in the instance's cra_name.  This is incorrect because it then
-prevents all users from allocating "rfc7539(chacha20,poly1305)", if the
-highest priority implementations of chacha20 and poly1305 were selected.
-Also, the self-tests aren't run on an instance allocated in this way.
-
-Fix it by setting the instance's cra_name from the underlying
-algorithms' actual cra_names, rather than from the requested names.
-This matches what other templates do.
-
-Fixes: 71ebc4d1b27d ("crypto: chacha20poly1305 - Add a ChaCha20-Poly1305 AEAD construction, RFC7539")
-Cc: <stable@vger.kernel.org> # v4.2+
-Cc: Martin Willi <martin@strongswan.org>
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Reviewed-by: Martin Willi <martin@strongswan.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- crypto/chacha20poly1305.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/crypto/chacha20poly1305.c
-+++ b/crypto/chacha20poly1305.c
-@@ -637,8 +637,8 @@ static int chachapoly_create(struct cryp
- 
-       err = -ENAMETOOLONG;
-       if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
--                   "%s(%s,%s)", name, chacha_name,
--                   poly_name) >= CRYPTO_MAX_ALG_NAME)
-+                   "%s(%s,%s)", name, chacha->base.cra_name,
-+                   poly->cra_name) >= CRYPTO_MAX_ALG_NAME)
-               goto out_drop_chacha;
-       if (snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,
-                    "%s(%s,%s)", name, chacha->cra_driver_name,

diff --git a/queue-4.4/series b/queue-4.4/series
index e4bb82b8e6bc97afcbac721fe02c59b305ebf419..cab370fe99c94f93565dbd7889886167238d1e89 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,12 +1,10 @@
 x86-speculation-mds-revert-cpu-buffer-clear-on-double-fault-exit.patch
 x86-speculation-mds-improve-cpu-buffer-clear-documentation.patch
 arm-exynos-fix-a-leaked-reference-by-adding-missing-of_node_put.patch
-crypto-chacha20poly1305-set-cra_name-correctly.patch
 crypto-vmx-fix-copy-paste-error-in-ctr-mode.patch
 crypto-crct10dif-generic-fix-use-via-crypto_shash_digest.patch
 crypto-x86-crct10dif-pcl-fix-use-via-crypto_shash_digest.patch
 alsa-usb-audio-fix-a-memory-leak-bug.patch
-alsa-hda-hdmi-read-the-pin-sense-from-register-when-repolling.patch
 alsa-hda-hdmi-consider-eld_valid-when-reporting-jack-event.patch
 alsa-hda-realtek-eapd-turn-on-later.patch
 asoc-max98090-fix-restore-of-dapm-muxes.patch