gentoo auto-resync : 21:12:2022 - 19:55:00

3 files changed, 0 insertions, 53 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e1d829f15ee8..f9621c8796f8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest
index 875488c63068..9de253bb01c0 100644
--- a/app-emulation/vendor-reset/Manifest
+++ b/app-emulation/vendor-reset/Manifest
@@ -1,4 +1,3 @@
-AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f
 AUX Respect-eselect-kernel.patch 257 BLAKE2B 7ff9942cccd5e637e56efb5eacc4ce11ce1b0ab318e43a77b6f0fa3adf675ec2646de207e37fc269ea88e52228e9688eb3e7a16934d37e470a935d257ebecf4b SHA512 e2081192dd982c1ddf0f8897d24c5ddb93e0e1ce47973a279146a3165f1b6a00aeae5369c9280552f8317f573c57c9125214b775c3b1614d67780476611db14e
 AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
 DIST vendor-reset-0.1.1_pre20221205.tar.gz 12725340 BLAKE2B 5f2e34b74e83c8f48daad8d2c714872ab23f50cb0fad6b5c7920476b43c2fbfcf5543e923c506dfb2d8c33846e8fdd08c7d20b30fcc053f2c191d813872b44c5 SHA512 87a3c64d917e6a44308115480f14956f65a9f84fef70de29feebe3fcd7d522b59a3dbcb5fc9a340ac9b7a3612a29ed696b4f52648f86a0d877b915c97c5a4cc9
diff --git a/app-emulation/vendor-reset/files/Fix-5.11-build.patch b/app-emulation/vendor-reset/files/Fix-5.11-build.patch
deleted file mode 100644
index 845ea08afc54..000000000000
--- a/app-emulation/vendor-reset/files/Fix-5.11-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 225a49a40941e350899e456366265cf82b87ad25 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?T=C3=A9rence=20Clastres?= <t.clastres@gmail.com>
-Date: Sun, 31 Jan 2021 20:22:00 +0100
-Subject: [PATCH] [core] add support for linux 5.11
-
-This approach maintains compatibility with previous kernel versions.
-
-Thanks to @justinkb for finding the commit that broke it (torvalds/linux@d19ad07).
----
- dkms.conf    | 2 +-
- src/ftrace.c | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/dkms.conf b/dkms.conf
-index 396abd3..09fbcf0 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -1,5 +1,5 @@
- PACKAGE_NAME="vendor-reset"
--PACKAGE_VERSION="0.1.0"
-+PACKAGE_VERSION="0.1.1"
- BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
- MAKE[0]="make KDIR=${kernel_source_dir}"
- CLEAN="make KDIR=${kernel_source_dir} clean"
-diff --git a/src/ftrace.c b/src/ftrace.c
-index 80bb4aa..7eed223 100644
---- a/src/ftrace.c
-+++ b/src/ftrace.c
-@@ -22,6 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
- #include <linux/ftrace.h>
- #include <linux/kprobes.h>
- #include <linux/pci.h>
-+#include <linux/version.h>
- 
- #include "ftrace.h"
- 
-@@ -48,8 +49,15 @@ static int resolve_hook_address(struct ftrace_hook *hook)
-   return 0;
- }
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
- static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct pt_regs *regs)
- {
-+#else
-+static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
-+{
-+  struct pt_regs *regs;
-+  regs = ftrace_get_regs(fregs);
-+#endif
-   struct ftrace_hook *hook = to_ftrace_hook(ops);
- 
-   if (!within_module(parent_ip, THIS_MODULE))