mirror of
https://git.proxmox.com/git/pve-kernel
synced 2025-04-28 18:44:58 +00:00
9ecdffc222
Provide a newer – currently – opt-in kernel that will form the base for Ubuntu's 25.04 release. Using the current relevant tag Ubuntu-6.14.0-12.12 (the newer 13.13 tag includes only some packaging changes that do not affect us) from the upstream repo [0]. Update the patches, drop those that got applied upstream or are simply not relevant for the newer kernel anymore. Update the ZFS submodule to include a cherry-pick of the two Linux 6.14 compat patches that already got applied to ZFS upstream [1]. [0]: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/plucky/ [1]: https://github.com/openzfs/zfs/pull/17026 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Date: Tue, 10 Jan 2023 08:52:40 +0100
|
|
Subject: [PATCH] Revert "fortify: Do not cast to "unsigned char""
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This reverts commit 106b7a61c488d2022f44e3531ce33461c7c0685f.
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
include/linux/fortify-string.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h
|
|
index e4ce1cae03bf770047ce8a7c032b183683388cd5..16fcaf15da54f93fb1c14e392d0e0b7907435f25 100644
|
|
--- a/include/linux/fortify-string.h
|
|
+++ b/include/linux/fortify-string.h
|
|
@@ -62,7 +62,7 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning("
|
|
|
|
#define __compiletime_strlen(p) \
|
|
({ \
|
|
- char *__p = (char *)(p); \
|
|
+ unsigned char *__p = (unsigned char *)(p); \
|
|
size_t __ret = SIZE_MAX; \
|
|
const size_t __p_size = __member_size(p); \
|
|
if (__p_size != SIZE_MAX && \
|