diff options
| -rw-r--r-- | SOURCES/patch-5.17-redhat.patch | 10 | ||||
| -rwxr-xr-x | SPECS/kernel.spec | 15 |
2 files changed, 14 insertions, 11 deletions
diff --git a/SOURCES/patch-5.17-redhat.patch b/SOURCES/patch-5.17-redhat.patch index 9260e60..afb187a 100644 --- a/SOURCES/patch-5.17-redhat.patch +++ b/SOURCES/patch-5.17-redhat.patch @@ -109,7 +109,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 5450a2c9efa6..55c84f323a7d 100644 +index c3676b04ca38..0d3b2030e876 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1973,7 +1973,7 @@ index 8723ae70ea1f..fb2d773498c2 100644 + return ret; } diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 9e9713f7ddb8..57646a96cb2d 100644 +index f1feb9204063..d6374d1c7e2f 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3667,8 +3667,8 @@ static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb) @@ -1988,7 +1988,7 @@ index 9e9713f7ddb8..57646a96cb2d 100644 kfree_skb(skb); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index e04ae56931e2..da97e6a8ee0a 100644 +index eae6ae9d3c3b..2b5775411bef 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -21,6 +21,7 @@ @@ -1999,7 +1999,7 @@ index e04ae56931e2..da97e6a8ee0a 100644 /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2366,6 +2367,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -2367,6 +2368,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -2012,7 +2012,7 @@ index e04ae56931e2..da97e6a8ee0a 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2595,6 +2602,7 @@ int main(int argc, char **argv) +@@ -2596,6 +2603,7 @@ int main(int argc, char **argv) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 3c610f9..c960e7b 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -130,7 +130,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.17 -%define rpmversion 5.17.14 +%define rpmversion 5.17.15 %define patchversion 5.17 %define pkgrelease 301 @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17.14.tar.xz +Source0: linux-5.17.15.tar.xz Source1: Makefile.rhelver @@ -1401,8 +1401,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17.14 -c -mv linux-5.17.14 linux-%{KVERREL} +%setup -q -n kernel-5.17.15 -c +mv linux-5.17.15 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3042,8 +3042,11 @@ fi # # %changelog -* Wed Jun 15 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.17.14-301.fsync -- Linux v5.17.14 futex2 zen openrgb +* Sun Jun 19 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 5.17.15-301.fsync +- Linux v5.17.15 futex2 zen openrgb + +* Tue Jun 14 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.15-300] +- v5.17.15 rebase * Thu Jun 09 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.14-0] - Config updates for stable backports (Justin M. Forbes) |