+++ /dev/null
-From dff59df5a4b23a8a75be49f4ba3160a0d1ed6880 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 Mar 2025 08:45:12 +0000
-Subject: rust: fix signature of rust_fmt_argument
-
-From: Alice Ryhl <aliceryhl@google.com>
-
-[ Upstream commit 901b3290bd4dc35e613d13abd03c129e754dd3dd ]
-
-Without this change, the rest of this series will emit the following
-error message:
-
-error[E0308]: `if` and `else` have incompatible types
- --> <linux>/rust/kernel/print.rs:22:22
- |
-21 | #[export]
- | --------- expected because of this
-22 | unsafe extern "C" fn rust_fmt_argument(
- | ^^^^^^^^^^^^^^^^^ expected `u8`, found `i8`
- |
- = note: expected fn item `unsafe extern "C" fn(*mut u8, *mut u8, *mut c_void) -> *mut u8 {bindings::rust_fmt_argument}`
- found fn item `unsafe extern "C" fn(*mut i8, *mut i8, *const c_void) -> *mut i8 {print::rust_fmt_argument}`
-
-The error may be different depending on the architecture.
-
-To fix this, change the void pointer argument to use a const pointer,
-and change the imports to use crate::ffi instead of core::ffi for
-integer types.
-
-Fixes: 787983da7718 ("vsprintf: add new `%pA` format specifier")
-Reviewed-by: Tamir Duberstein <tamird@gmail.com>
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Alice Ryhl <aliceryhl@google.com>
-Acked-by: Petr Mladek <pmladek@suse.com>
-Link: https://lore.kernel.org/r/20250303-export-macro-v3-1-41fbad85a27f@google.com
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/vsprintf.c | 2 +-
- rust/kernel/print.rs | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index fa1c197018551..408a92c5a4f79 100644
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -2257,7 +2257,7 @@ int __init no_hash_pointers_enable(char *str)
- early_param("no_hash_pointers", no_hash_pointers_enable);
-
- /* Used for Rust formatting ('%pA'). */
--char *rust_fmt_argument(char *buf, char *end, void *ptr);
-+char *rust_fmt_argument(char *buf, char *end, const void *ptr);
-
- /*
- * Show a '%p' thing. A kernel extension is that the '%p' is followed
-diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs
-index b6d1c12136de1..e21be6996932e 100644
---- a/rust/kernel/print.rs
-+++ b/rust/kernel/print.rs
-@@ -6,12 +6,11 @@
- //!
- //! Reference: <https://www.kernel.org/doc/html/latest/core-api/printk-basics.html>
-
--use core::{
-+use crate::{
- ffi::{c_char, c_void},
-- fmt,
-+ str::RawFormatter,
- };
--
--use crate::str::RawFormatter;
-+use core::fmt;
-
- #[cfg(CONFIG_PRINTK)]
- use crate::bindings;
---
-2.39.5
-
clk-amlogic-g12b-fix-cluster-a-parent-data.patch
clk-amlogic-gxbb-drop-non-existing-32k-clock-parent.patch
selftests-bpf-select-numa_no_node-to-create-map.patch
-rust-fix-signature-of-rust_fmt_argument.patch
clk-amlogic-g12a-fix-mmc-a-peripheral-clock.patch
x86-entry-fix-orc-unwinder-for-push_regs-with-save_r.patch
power-supply-max77693-fix-wrong-conversion-of-charge.patch
+++ /dev/null
-From 9972da8b6f0b22e14f78282260d774eff354145e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 14 Feb 2025 12:28:00 +0000
-Subject: ntsync: Set the permissions to be 0666
-
-From: Mike Lothian <mike@fireburn.co.uk>
-
-[ Upstream commit fa2e55811ae25020a5e9b23a8932e67e6d6261a4 ]
-
-This allows ntsync to be usuable by non-root processes out of the box
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
-Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
-Link: https://lore.kernel.org/r/20250214122759.2629-2-mike@fireburn.co.uk
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/misc/ntsync.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
-index 4954553b7baa6..c3ba3f0ebf300 100644
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -238,6 +238,7 @@ static struct miscdevice ntsync_misc = {
- .minor = MISC_DYNAMIC_MINOR,
- .name = NTSYNC_NAME,
- .fops = &ntsync_fops,
-+ .mode = 0666,
- };
-
- module_misc_device(ntsync_misc);
---
-2.39.5
-
wifi-mac80211-remove-debugfs-dir-for-virtual-monitor.patch
wifi-iwlwifi-fw-allocate-chained-sg-tables-for-dump.patch
wifi-iwlwifi-mvm-use-the-right-version-of-the-rate-a.patch
-ntsync-set-the-permissions-to-be-0666.patch
nvme-tcp-fix-possible-uaf-in-nvme_tcp_poll.patch
nvme-pci-clean-up-cmbmsc-when-registering-cmb-fails.patch
nvme-pci-skip-cmb-blocks-incompatible-with-pci-p2p-d.patch
+++ /dev/null
-From c08aa4f2c6fa882a9a98c6507f5f3698b5dda2b9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 14 Feb 2025 12:28:00 +0000
-Subject: ntsync: Set the permissions to be 0666
-
-From: Mike Lothian <mike@fireburn.co.uk>
-
-[ Upstream commit fa2e55811ae25020a5e9b23a8932e67e6d6261a4 ]
-
-This allows ntsync to be usuable by non-root processes out of the box
-
-Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
-Reviewed-by: Elizabeth Figura <zfigura@codeweavers.com>
-Link: https://lore.kernel.org/r/20250214122759.2629-2-mike@fireburn.co.uk
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/misc/ntsync.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/misc/ntsync.c b/drivers/misc/ntsync.c
-index 4954553b7baa6..c3ba3f0ebf300 100644
---- a/drivers/misc/ntsync.c
-+++ b/drivers/misc/ntsync.c
-@@ -238,6 +238,7 @@ static struct miscdevice ntsync_misc = {
- .minor = MISC_DYNAMIC_MINOR,
- .name = NTSYNC_NAME,
- .fops = &ntsync_fops,
-+ .mode = 0666,
- };
-
- module_misc_device(ntsync_misc);
---
-2.39.5
-
wifi-mac80211-remove-debugfs-dir-for-virtual-monitor.patch
wifi-iwlwifi-fw-allocate-chained-sg-tables-for-dump.patch
wifi-iwlwifi-mvm-use-the-right-version-of-the-rate-a.patch
-ntsync-set-the-permissions-to-be-0666.patch
nvme-tcp-fix-possible-uaf-in-nvme_tcp_poll.patch
nvme-pci-clean-up-cmbmsc-when-registering-cmb-fails.patch
nvme-pci-skip-cmb-blocks-incompatible-with-pci-p2p-d.patch
+++ /dev/null
-From ddbfaac77fa2bebf2ac40c9c5a219fc9b2691a1f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 3 Mar 2025 08:45:12 +0000
-Subject: rust: fix signature of rust_fmt_argument
-
-From: Alice Ryhl <aliceryhl@google.com>
-
-[ Upstream commit 901b3290bd4dc35e613d13abd03c129e754dd3dd ]
-
-Without this change, the rest of this series will emit the following
-error message:
-
-error[E0308]: `if` and `else` have incompatible types
- --> <linux>/rust/kernel/print.rs:22:22
- |
-21 | #[export]
- | --------- expected because of this
-22 | unsafe extern "C" fn rust_fmt_argument(
- | ^^^^^^^^^^^^^^^^^ expected `u8`, found `i8`
- |
- = note: expected fn item `unsafe extern "C" fn(*mut u8, *mut u8, *mut c_void) -> *mut u8 {bindings::rust_fmt_argument}`
- found fn item `unsafe extern "C" fn(*mut i8, *mut i8, *const c_void) -> *mut i8 {print::rust_fmt_argument}`
-
-The error may be different depending on the architecture.
-
-To fix this, change the void pointer argument to use a const pointer,
-and change the imports to use crate::ffi instead of core::ffi for
-integer types.
-
-Fixes: 787983da7718 ("vsprintf: add new `%pA` format specifier")
-Reviewed-by: Tamir Duberstein <tamird@gmail.com>
-Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Alice Ryhl <aliceryhl@google.com>
-Acked-by: Petr Mladek <pmladek@suse.com>
-Link: https://lore.kernel.org/r/20250303-export-macro-v3-1-41fbad85a27f@google.com
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- lib/vsprintf.c | 2 +-
- rust/kernel/print.rs | 7 +++----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 2aa408441cd3e..14b27db236cc8 100644
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -2275,7 +2275,7 @@ int __init no_hash_pointers_enable(char *str)
- early_param("no_hash_pointers", no_hash_pointers_enable);
-
- /* Used for Rust formatting ('%pA'). */
--char *rust_fmt_argument(char *buf, char *end, void *ptr);
-+char *rust_fmt_argument(char *buf, char *end, const void *ptr);
-
- /*
- * Show a '%p' thing. A kernel extension is that the '%p' is followed
-diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs
-index f48926e3e9fe3..34788218ea5d2 100644
---- a/rust/kernel/print.rs
-+++ b/rust/kernel/print.rs
-@@ -6,12 +6,11 @@
- //!
- //! Reference: <https://www.kernel.org/doc/html/latest/core-api/printk-basics.html>
-
--use core::{
-+use crate::{
- ffi::{c_char, c_void},
-- fmt,
-+ str::RawFormatter,
- };
--
--use crate::str::RawFormatter;
-+use core::fmt;
-
- #[cfg(CONFIG_PRINTK)]
- use crate::bindings;
---
-2.39.5
-
clk-amlogic-g12b-fix-cluster-a-parent-data.patch
clk-amlogic-gxbb-drop-non-existing-32k-clock-parent.patch
selftests-bpf-select-numa_no_node-to-create-map.patch
-rust-fix-signature-of-rust_fmt_argument.patch
clk-clk-imx8mp-audiomix-fix-dsp-ocram_a-clock-parent.patch
clk-amlogic-g12a-fix-mmc-a-peripheral-clock.patch
x86-entry-fix-orc-unwinder-for-push_regs-with-save_r.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
