From 12968d4fe58dc78a9b86d981155cc906ea1a8f5d Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: May 17 2023 15:40:49 +0000
Subject: Linux v6.3.3 rebase


Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 2e730e2..d3a13af 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -5,13 +5,13 @@
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
 %global released_kernel 1
-%global baserelease 300
+%global baserelease 200
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
 # which yields a base_sublevel of 0.
-%global base_sublevel 2
+%global base_sublevel 3
 
 %global base_major 6
 
@@ -19,7 +19,7 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%global stable_update 6
+%global stable_update 3
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %global stablerev %{stable_update}
@@ -204,6 +204,18 @@ testing Linux as a black box, rtla leverages kernel tracing
 capabilities to provide precise information about the properties
 and root causes of unexpected results.
 
+%package -n rv
+Summary: RV: Runtime Verification
+License: GPLv2
+%description -n rv
+Runtime Verification (RV) is a lightweight (yet rigorous) method that
+complements classical exhaustive verification techniques (such as model
+checking and theorem proving) with a more practical approach for
+complex systems.
+The rv tool is the interface for a collection of monitors that aim
+analysing the logical and timing behavior of Linux.
+
+
 %prep
 %setup -q -n kernel-%{kversion}%{?dist} -c
 
@@ -292,9 +304,12 @@ pushd tools/gpio/
 %{tools_make}
 popd
 # build VM tools
-pushd tools/vm/
+pushd tools/mm/
 %{tools_make} slabinfo page_owner_sort
 popd 
+pushd tools/verification/rv/
+%{tools_make}
+popd
 pushd tools/tracing/rtla
 %{tools_make}
 popd
@@ -394,12 +409,22 @@ popd
 pushd tools/gpio
 %{tools_make} DESTDIR=%{buildroot} install
 popd
+# install VM tools
+pushd tools/mm/
+install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo
+install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
+popd
+pushd tools/verification/rv/
+%{tools_make} DESTDIR=%{buildroot} install
+popd
 pushd tools/tracing/rtla/
 %{tools_make} DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_bindir}/hwnoise
 rm -f %{buildroot}%{_bindir}/osnoise
 rm -f %{buildroot}%{_bindir}/timerlat
 (cd %{buildroot}
 
+        ln -sf rtla ./%{_bindir}/hwnoise
         ln -sf rtla ./%{_bindir}/osnoise
         ln -sf rtla ./%{_bindir}/timerlat
 )
@@ -485,6 +510,9 @@ popd
 %{_bindir}/gpio-watch
 %{_mandir}/man1/kvm_stat*
 %{_bindir}/kvm_stat
+%{_bindir}/page_owner_sort
+%{_bindir}/slabinfo
+
 %license linux-%{kversion}/COPYING
 
 %files -n kernel-tools-libs
@@ -547,8 +575,10 @@ popd
 
 %files -n rtla
 %{_bindir}/rtla
+%{_bindir}/hwnoise
 %{_bindir}/osnoise
 %{_bindir}/timerlat
+%{_mandir}/man1/rtla-hwnoise.1.gz
 %{_mandir}/man1/rtla-osnoise-hist.1.gz
 %{_mandir}/man1/rtla-osnoise-top.1.gz
 %{_mandir}/man1/rtla-osnoise.1.gz
@@ -557,7 +587,18 @@ popd
 %{_mandir}/man1/rtla-timerlat.1.gz
 %{_mandir}/man1/rtla.1.gz
 
+%files -n rv
+%{_bindir}/rv
+%{_mandir}/man1/rv-list.1.gz
+%{_mandir}/man1/rv-mon-wip.1.gz
+%{_mandir}/man1/rv-mon-wwnr.1.gz
+%{_mandir}/man1/rv-mon.1.gz
+%{_mandir}/man1/rv.1.gz
+
 %changelog
+* Wed May 17 2023 Justin M. Forbes <jforbes@fedoraproject.org> - 6.3.3-200
+- Linux v6.3.3
+
 * Mon Mar 13 2023 Justin M. Forbes <jforbes@fedoraproject.org> - 6.2.6-100
 - Linux v6.2.6
 
diff --git a/sources b/sources
index 09f961e..6f6543b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (linux-6.2.tar.xz) = a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-SHA512 (patch-6.2.6.xz) = 9dea17f7d385fc1b1cfb95dcd0cfdb5a73d77e52c585c518a91be03ad862017ef8762d423030071cde893814051cbb6898cd14a41ab3939ffac252b1106948e8
+SHA512 (linux-6.3.tar.xz) = 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+SHA512 (patch-6.3.3.xz) = 0f5aeb2a0adb99faec961d93d421f67582f23459d2591c07a0152c042d8c87a2d2061ea4dc6a6be8a25da07b70a6bc2f83479f36cb14636c8dbf6b9fb9827e31