From f1dc930096e0a6d80830a4eb58de91c236f0f9dc Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Feb 26 2020 17:37:09 +0000
Subject: Update to 5.4.22


---

diff --git a/.kernel.metadata b/.kernel.metadata
index ebb210c..ffdc3a8 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,2 +1,2 @@
 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd  SOURCES/linux-5.4.tar.xz
-7e01baaaab76667552960100d8a0cc2376057e73  SOURCES/patch-5.4.20.xz
+7ffe5446faa1749bd4efbab9540625a2bef4bec6  SOURCES/patch-5.4.22.xz
diff --git a/SOURCES/alsa-5.5.patch b/SOURCES/alsa-5.5.patch
index 92af336..b7ab52d 100644
--- a/SOURCES/alsa-5.5.patch
+++ b/SOURCES/alsa-5.5.patch
@@ -59,70 +59,6 @@ index f0e8e1539450..aea3b4ad7ded 100644
 -- 
 2.24.1
 
-From 17bbbd02508acda4df32c4f0668434dccb56bdca Mon Sep 17 00:00:00 2001
-From: Saurav Girepunje <saurav.girepunje@gmail.com>
-Date: Tue, 29 Oct 2019 23:22:00 +0530
-Subject: [PATCH 002/109] ALSA: usb-audio: sound: usb: usb true/false for bool
- return type
-
-Use true/false for bool type return in uac_clock_source_is_valid().
-
-Signed-off-by: Saurav Girepunje <saurav.girepunje@gmail.com>
-Link: https://lore.kernel.org/r/20191029175200.GA7320@saurav
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 1d4961d9eb1aaa498dfb44779b7e4b95d79112d0)
-Bugzilla: 1772498
----
- sound/usb/clock.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/sound/usb/clock.c b/sound/usb/clock.c
-index 6b8c14f9b5d4..018b1ecb5404 100644
---- a/sound/usb/clock.c
-+++ b/sound/usb/clock.c
-@@ -165,21 +165,21 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip,
- 			snd_usb_find_clock_source_v3(chip->ctrl_intf, source_id);
- 
- 		if (!cs_desc)
--			return 0;
-+			return false;
- 		bmControls = le32_to_cpu(cs_desc->bmControls);
- 	} else { /* UAC_VERSION_1/2 */
- 		struct uac_clock_source_descriptor *cs_desc =
- 			snd_usb_find_clock_source(chip->ctrl_intf, source_id);
- 
- 		if (!cs_desc)
--			return 0;
-+			return false;
- 		bmControls = cs_desc->bmControls;
- 	}
- 
- 	/* If a clock source can't tell us whether it's valid, we assume it is */
- 	if (!uac_v2v3_control_is_readable(bmControls,
- 				      UAC2_CS_CONTROL_CLOCK_VALID))
--		return 1;
-+		return true;
- 
- 	err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
- 			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-@@ -191,10 +191,10 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip,
- 		dev_warn(&dev->dev,
- 			 "%s(): cannot get clock validity for id %d\n",
- 			   __func__, source_id);
--		return 0;
-+		return false;
- 	}
- 
--	return !!data;
-+	return data ? true :  false;
- }
- 
- static int __uac_clock_find_source(struct snd_usb_audio *chip, int entity_id,
--- 
-2.24.1
-
 From 042dd0cc1f179d52acfea699239b87ef93dbd70d Mon Sep 17 00:00:00 2001
 From: Takashi Iwai <tiwai@suse.de>
 Date: Thu, 14 Nov 2019 17:56:13 +0100
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 056e047..faec6fe 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 20
+%define stable_update 22
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -2905,6 +2905,9 @@ fi
 #
 #
 %changelog
+* Wed Feb 26 2020 Pablo Greco <pgreco@centosproject.org> - 5.4.22-200
+- Update to 5.4.22
+
 * Mon Feb 24 2020 Pablo Greco <pgreco@centosproject.org> - 5.4.20-200
 - Import from f31
 - Remove Fedora signing token