aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--queue-6.12/series3
-rw-r--r--queue-6.12/tools-nolibc-use-intmax-definitions-from-compiler.patch46
-rw-r--r--queue-6.12/tools-nolibc-use-pselect6_time64-if-available.patch45
-rw-r--r--queue-6.15/series1
-rw-r--r--queue-6.15/tools-nolibc-use-intmax-definitions-from-compiler.patch46
-rw-r--r--queue-6.6/series1
-rw-r--r--queue-6.6/tools-nolibc-use-intmax-definitions-from-compiler.patch46
7 files changed, 1 insertions, 187 deletions
diff --git a/queue-6.12/series b/queue-6.12/series
index 7cd8810369a..985d8893af4 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -167,7 +167,6 @@ iio-adc-ad7606_spi-fix-reg-write-value-mask.patch
acpica-fix-acpi-operand-cache-leak-in-dswstate.c.patch
asoc-amd-yc-add-quirk-for-lenovo-yoga-pro-7-14asp9.patch
clocksource-fix-the-cpus-choice-in-the-watchdog-per-.patch
-tools-nolibc-use-intmax-definitions-from-compiler.patch
power-supply-collie-fix-wakeup-source-leaks-on-devic.patch
mmc-add-quirk-to-disable-ddr50-tuning.patch
acpica-avoid-sequence-overread-in-call-to-strncmp.patch
@@ -187,7 +186,6 @@ asoc-tegra210_ahub-add-check-to-of_device_get_match_.patch
make-cc-option-work-correctly-for-the-wno-xyzzy-patt.patch
gpiolib-of-add-polarity-quirk-for-s5m8767.patch
pm-runtime-fix-denying-of-auto-suspend-in-pm_suspend.patch
-tools-nolibc-use-pselect6_time64-if-available.patch
power-supply-max17040-adjust-thermal-channel-scaling.patch
acpi-battery-negate-current-when-discharging.patch
net-macb-check-return-value-of-dma_set_mask_and_cohe.patch
@@ -325,3 +323,4 @@ selinux-fix-selinux_xfrm_alloc_user-to-set-correct-ctx_len.patch
platform-x86-intel-uncore-freq-fail-module-load-when-plat_info-is-null.patch
sched_ext-sched-core-don-t-call-scx_group_set_weight-prematurely-from-sched_create_group.patch
atm-revert-atm_account_tx-if-copy_from_iter_full-fails.patch
+wifi-rtw89-phy-add-dummy-c2h-event-handler-for-report-of-tas-power.patch
diff --git a/queue-6.12/tools-nolibc-use-intmax-definitions-from-compiler.patch b/queue-6.12/tools-nolibc-use-intmax-definitions-from-compiler.patch
deleted file mode 100644
index c080f368054..00000000000
--- a/queue-6.12/tools-nolibc-use-intmax-definitions-from-compiler.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 875e235984371adb76ac2bb54c2987aa3bb411c4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 11:00:39 +0200
-Subject: tools/nolibc: use intmax definitions from compiler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-
-[ Upstream commit e5407c0820ea5fa7117b85ed32b724af73156d63 ]
-
-The printf format checking in the compiler uses the intmax types from
-the compiler, not libc. This can lead to compiler errors.
-
-Instead use the types already provided by the compiler.
-
-Example issue with clang 19 for arm64:
-
-nolibc-test.c:30:2: error: format specifies type 'uintmax_t' (aka 'unsigned long') but the argument has type 'uintmax_t' (aka 'unsigned long long') [-Werror,-Wformat]
-
-Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdint.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdint.h b/tools/include/nolibc/stdint.h
-index cd79ddd6170e0..b052ad6303c38 100644
---- a/tools/include/nolibc/stdint.h
-+++ b/tools/include/nolibc/stdint.h
-@@ -39,8 +39,8 @@ typedef size_t uint_fast32_t;
- typedef int64_t int_fast64_t;
- typedef uint64_t uint_fast64_t;
-
--typedef int64_t intmax_t;
--typedef uint64_t uintmax_t;
-+typedef __INTMAX_TYPE__ intmax_t;
-+typedef __UINTMAX_TYPE__ uintmax_t;
-
- /* limits of integral types */
-
---
-2.39.5
-
diff --git a/queue-6.12/tools-nolibc-use-pselect6_time64-if-available.patch b/queue-6.12/tools-nolibc-use-pselect6_time64-if-available.patch
deleted file mode 100644
index fe3863bfe04..00000000000
--- a/queue-6.12/tools-nolibc-use-pselect6_time64-if-available.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e51291bdfe4d13052e2d920ded8828768d49b60a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 11:00:40 +0200
-Subject: tools/nolibc: use pselect6_time64 if available
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-
-[ Upstream commit 248ddc80b145515286bfb75d08034ad4c0fdb08e ]
-
-riscv32 does not have any of the older select systemcalls.
-Use pselect6_time64 instead.
-poll() is also used to implement sleep().
-
-Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/sys.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
-index 7b82bc3cf1074..ab5b9ff285c03 100644
---- a/tools/include/nolibc/sys.h
-+++ b/tools/include/nolibc/sys.h
-@@ -981,6 +981,14 @@ int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeva
- t.tv_nsec = timeout->tv_usec * 1000;
- }
- return my_syscall6(__NR_pselect6, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL);
-+#elif defined(__NR_pselect6_time64)
-+ struct __kernel_timespec t;
-+
-+ if (timeout) {
-+ t.tv_sec = timeout->tv_sec;
-+ t.tv_nsec = timeout->tv_usec * 1000;
-+ }
-+ return my_syscall6(__NR_pselect6_time64, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL);
- #else
- return __nolibc_enosys(__func__, nfds, rfds, wfds, efds, timeout);
- #endif
---
-2.39.5
-
diff --git a/queue-6.15/series b/queue-6.15/series
index e50921a1eb0..dcd47b4adb2 100644
--- a/queue-6.15/series
+++ b/queue-6.15/series
@@ -207,7 +207,6 @@ acpica-fix-acpi-operand-cache-leak-in-dswstate.c.patch
asoc-amd-yc-add-quirk-for-lenovo-yoga-pro-7-14asp9.patch
clocksource-fix-the-cpus-choice-in-the-watchdog-per-.patch
power-supply-gpio-charger-fix-wakeup-source-leaks-on.patch
-tools-nolibc-use-intmax-definitions-from-compiler.patch
power-supply-collie-fix-wakeup-source-leaks-on-devic.patch
mmc-add-quirk-to-disable-ddr50-tuning.patch
acpica-avoid-sequence-overread-in-call-to-strncmp.patch
diff --git a/queue-6.15/tools-nolibc-use-intmax-definitions-from-compiler.patch b/queue-6.15/tools-nolibc-use-intmax-definitions-from-compiler.patch
deleted file mode 100644
index 9c52a473a49..00000000000
--- a/queue-6.15/tools-nolibc-use-intmax-definitions-from-compiler.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8960fa8611adb352b79fcfc9188ed5d494311fea Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 11:00:39 +0200
-Subject: tools/nolibc: use intmax definitions from compiler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-
-[ Upstream commit e5407c0820ea5fa7117b85ed32b724af73156d63 ]
-
-The printf format checking in the compiler uses the intmax types from
-the compiler, not libc. This can lead to compiler errors.
-
-Instead use the types already provided by the compiler.
-
-Example issue with clang 19 for arm64:
-
-nolibc-test.c:30:2: error: format specifies type 'uintmax_t' (aka 'unsigned long') but the argument has type 'uintmax_t' (aka 'unsigned long long') [-Werror,-Wformat]
-
-Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdint.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdint.h b/tools/include/nolibc/stdint.h
-index cd79ddd6170e0..b052ad6303c38 100644
---- a/tools/include/nolibc/stdint.h
-+++ b/tools/include/nolibc/stdint.h
-@@ -39,8 +39,8 @@ typedef size_t uint_fast32_t;
- typedef int64_t int_fast64_t;
- typedef uint64_t uint_fast64_t;
-
--typedef int64_t intmax_t;
--typedef uint64_t uintmax_t;
-+typedef __INTMAX_TYPE__ intmax_t;
-+typedef __UINTMAX_TYPE__ uintmax_t;
-
- /* limits of integral types */
-
---
-2.39.5
-
diff --git a/queue-6.6/series b/queue-6.6/series
index fe72a79d7e1..93d5196f77c 100644
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -116,7 +116,6 @@ iio-adc-ad7606_spi-fix-reg-write-value-mask.patch
acpica-fix-acpi-operand-cache-leak-in-dswstate.c.patch
asoc-amd-yc-add-quirk-for-lenovo-yoga-pro-7-14asp9.patch
clocksource-fix-the-cpus-choice-in-the-watchdog-per-.patch
-tools-nolibc-use-intmax-definitions-from-compiler.patch
power-supply-collie-fix-wakeup-source-leaks-on-devic.patch
mmc-add-quirk-to-disable-ddr50-tuning.patch
acpica-avoid-sequence-overread-in-call-to-strncmp.patch
diff --git a/queue-6.6/tools-nolibc-use-intmax-definitions-from-compiler.patch b/queue-6.6/tools-nolibc-use-intmax-definitions-from-compiler.patch
deleted file mode 100644
index 07691e71efb..00000000000
--- a/queue-6.6/tools-nolibc-use-intmax-definitions-from-compiler.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 992231694721078a70b7adc16f60b4d115f0e431 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 11 Apr 2025 11:00:39 +0200
-Subject: tools/nolibc: use intmax definitions from compiler
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-
-[ Upstream commit e5407c0820ea5fa7117b85ed32b724af73156d63 ]
-
-The printf format checking in the compiler uses the intmax types from
-the compiler, not libc. This can lead to compiler errors.
-
-Instead use the types already provided by the compiler.
-
-Example issue with clang 19 for arm64:
-
-nolibc-test.c:30:2: error: format specifies type 'uintmax_t' (aka 'unsigned long') but the argument has type 'uintmax_t' (aka 'unsigned long long') [-Werror,-Wformat]
-
-Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
-Acked-by: Willy Tarreau <w@1wt.eu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/include/nolibc/stdint.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/include/nolibc/stdint.h b/tools/include/nolibc/stdint.h
-index 6665e272e2132..87a2b09e2dda5 100644
---- a/tools/include/nolibc/stdint.h
-+++ b/tools/include/nolibc/stdint.h
-@@ -39,8 +39,8 @@ typedef size_t uint_fast32_t;
- typedef int64_t int_fast64_t;
- typedef uint64_t uint_fast64_t;
-
--typedef int64_t intmax_t;
--typedef uint64_t uintmax_t;
-+typedef __INTMAX_TYPE__ intmax_t;
-+typedef __UINTMAX_TYPE__ uintmax_t;
-
- /* limits of integral types */
-
---
-2.39.5
-