From: Greg Kroah-Hartman Date: Sat, 17 Jan 2026 15:12:25 +0000 (+0100) Subject: drop a samples patch X-Git-Tag: v6.6.121~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480174fdee11696abcd8a0d78b347beda8c9bf46;p=thirdparty%2Fkernel%2Fstable-queue.git drop a samples patch --- diff --git a/queue-5.10/samples-work-around-glibc-redefining-some-of-our-def.patch b/queue-5.10/samples-work-around-glibc-redefining-some-of-our-def.patch deleted file mode 100644 index 8fa987bed3..0000000000 --- a/queue-5.10/samples-work-around-glibc-redefining-some-of-our-def.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 104a36d1875b944b1687c0c1ec460062f26cb41b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Nov 2025 09:29:02 -0800 -Subject: samples: work around glibc redefining some of our defines wrong - -From: Linus Torvalds - -[ Upstream commit a48f822908982353c3256e35a089e9e7d0d61580 ] - -Apparently as of version 2.42, glibc headers define AT_RENAME_NOREPLACE -and some of the other flags for renameat2() and friends in . - -Which would all be fine, except for inexplicable reasons glibc decided -to define them _differently_ from the kernel definitions, which then -makes some of our sample code that includes both kernel headers and user -space headers unhappy, because the compiler will (correctly) complain -about redefining things. - -Now, mixing kernel headers and user space headers is always a somewhat -iffy proposition due to namespacing issues, but it's kind of inevitable -in our sample and selftest code. And this is just glibc being stupid. - -Those defines come from the kernel, glibc is exposing the kernel -interfaces, and glibc shouldn't make up some random new expressions for -these values. - -It's not like glibc headers changed the actual result values, but they -arbitrarily just decided to use a different expression to describe those -values. The kernel just does - - #define AT_RENAME_NOREPLACE 0x0001 - -while glibc does - - # define RENAME_NOREPLACE (1 << 0) - # define AT_RENAME_NOREPLACE RENAME_NOREPLACE - -instead. Same value in the end, but very different macro definition. - -For absolutely no reason. - -This has since been fixed in the glibc development tree, so eventually -we'll end up with the canonical expressions and no clashes. But in the -meantime the broken headers are in the glibc-2.42 release and have made -it out into distributions. - -Do a minimal work-around to make the samples build cleanly by just -undefining the affected macros in between the user space header include -and the kernel header includes. - -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin ---- - samples/vfs/test-statx.c | 6 ++++++ - samples/watch_queue/watch_test.c | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/samples/vfs/test-statx.c b/samples/vfs/test-statx.c -index 49c7a46cee073..424a6fa15723c 100644 ---- a/samples/vfs/test-statx.c -+++ b/samples/vfs/test-statx.c -@@ -19,6 +19,12 @@ - #include - #include - #include -+ -+// Work around glibc header silliness -+#undef AT_RENAME_NOREPLACE -+#undef AT_RENAME_EXCHANGE -+#undef AT_RENAME_WHITEOUT -+ - #include - #include - #define statx foo -diff --git a/samples/watch_queue/watch_test.c b/samples/watch_queue/watch_test.c -index 8c6cb57d5cfc5..24cf7d7a19725 100644 ---- a/samples/watch_queue/watch_test.c -+++ b/samples/watch_queue/watch_test.c -@@ -16,6 +16,12 @@ - #include - #include - #include -+ -+// Work around glibc header silliness -+#undef AT_RENAME_NOREPLACE -+#undef AT_RENAME_EXCHANGE -+#undef AT_RENAME_WHITEOUT -+ - #include - #include - #include --- -2.51.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 31d2289d6a..5943e71f59 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -20,7 +20,6 @@ bfs-reconstruct-file-type-when-loading-from-disk.patch pinctrl-qcom-msm-fix-deadlock-in-pinmux-configuratio.patch platform-x86-acer-wmi-ignore-backlight-event.patch platform-x86-huawei-wmi-add-keys-for-honor-models.patch -samples-work-around-glibc-redefining-some-of-our-def.patch comedi-c6xdigio-fix-invalid-pnp-driver-unregistration.patch comedi-multiq3-sanitize-config-options-in-multiq3_attach.patch comedi-check-device-s-attached-status-in-compat-ioctls.patch diff --git a/queue-5.15/samples-work-around-glibc-redefining-some-of-our-def.patch b/queue-5.15/samples-work-around-glibc-redefining-some-of-our-def.patch deleted file mode 100644 index 5a2e512a63..0000000000 --- a/queue-5.15/samples-work-around-glibc-redefining-some-of-our-def.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 293129f5d9b154599d0e7d9fddc78747eb994243 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 21 Nov 2025 09:29:02 -0800 -Subject: samples: work around glibc redefining some of our defines wrong - -From: Linus Torvalds - -[ Upstream commit a48f822908982353c3256e35a089e9e7d0d61580 ] - -Apparently as of version 2.42, glibc headers define AT_RENAME_NOREPLACE -and some of the other flags for renameat2() and friends in . - -Which would all be fine, except for inexplicable reasons glibc decided -to define them _differently_ from the kernel definitions, which then -makes some of our sample code that includes both kernel headers and user -space headers unhappy, because the compiler will (correctly) complain -about redefining things. - -Now, mixing kernel headers and user space headers is always a somewhat -iffy proposition due to namespacing issues, but it's kind of inevitable -in our sample and selftest code. And this is just glibc being stupid. - -Those defines come from the kernel, glibc is exposing the kernel -interfaces, and glibc shouldn't make up some random new expressions for -these values. - -It's not like glibc headers changed the actual result values, but they -arbitrarily just decided to use a different expression to describe those -values. The kernel just does - - #define AT_RENAME_NOREPLACE 0x0001 - -while glibc does - - # define RENAME_NOREPLACE (1 << 0) - # define AT_RENAME_NOREPLACE RENAME_NOREPLACE - -instead. Same value in the end, but very different macro definition. - -For absolutely no reason. - -This has since been fixed in the glibc development tree, so eventually -we'll end up with the canonical expressions and no clashes. But in the -meantime the broken headers are in the glibc-2.42 release and have made -it out into distributions. - -Do a minimal work-around to make the samples build cleanly by just -undefining the affected macros in between the user space header include -and the kernel header includes. - -Signed-off-by: Linus Torvalds -Signed-off-by: Sasha Levin ---- - samples/vfs/test-statx.c | 6 ++++++ - samples/watch_queue/watch_test.c | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/samples/vfs/test-statx.c b/samples/vfs/test-statx.c -index 49c7a46cee073..424a6fa15723c 100644 ---- a/samples/vfs/test-statx.c -+++ b/samples/vfs/test-statx.c -@@ -19,6 +19,12 @@ - #include - #include - #include -+ -+// Work around glibc header silliness -+#undef AT_RENAME_NOREPLACE -+#undef AT_RENAME_EXCHANGE -+#undef AT_RENAME_WHITEOUT -+ - #include - #include - #define statx foo -diff --git a/samples/watch_queue/watch_test.c b/samples/watch_queue/watch_test.c -index 8c6cb57d5cfc5..24cf7d7a19725 100644 ---- a/samples/watch_queue/watch_test.c -+++ b/samples/watch_queue/watch_test.c -@@ -16,6 +16,12 @@ - #include - #include - #include -+ -+// Work around glibc header silliness -+#undef AT_RENAME_NOREPLACE -+#undef AT_RENAME_EXCHANGE -+#undef AT_RENAME_WHITEOUT -+ - #include - #include - #include --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index aeacb331ab..bfd69fb0e2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -26,7 +26,6 @@ pinctrl-qcom-msm-fix-deadlock-in-pinmux-configuratio.patch platform-x86-acer-wmi-ignore-backlight-event.patch platform-x86-huawei-wmi-add-keys-for-honor-models.patch hid-elecom-add-support-for-elecom-m-xt3urbk-018f.patch -samples-work-around-glibc-redefining-some-of-our-def.patch comedi-c6xdigio-fix-invalid-pnp-driver-unregistration.patch comedi-multiq3-sanitize-config-options-in-multiq3_attach.patch comedi-check-device-s-attached-status-in-compat-ioctls.patch