Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rust-fixes-6.6' of https://github.com/Rust-for-Linux/linux
Pull rust fixes from Miguel Ojeda:
- GCC build: fix bindgen build error with '-fstrict-flex-arrays'
- Error module: fix the description for 'ECHILD' and fix Markdown
style nit
- Code docs: fix logo replacement
- Docs: update docs output path
- Kbuild: remove old docs output path in 'cleandocs' target
* tag 'rust-fixes-6.6' of https://github.com/Rust-for-Linux/linux:
rust: docs: fix logo replacement
kbuild: remove old Rust docs output path
docs: rust: update Rust docs output path
rust: fix bindgen build error with fstrict-flex-arrays
rust: error: Markdown style nit
rust: error: fix the description for `ECHILD`
+12
-12
+1
-1
Documentation/rust/general-information.rst
+1
-1
Documentation/rust/general-information.rst
+1
-1
Makefile
+1
-1
Makefile
···
1474
1474
# Directories & files removed with 'make clean'
1475
1475
CLEAN_FILES += vmlinux.symvers modules-only.symvers \
1476
1476
modules.builtin modules.builtin.modinfo modules.nsdeps \
1477
-
compile_commands.json .thinlto-cache rust/test rust/doc \
1477
+
compile_commands.json .thinlto-cache rust/test \
1478
1478
rust-project.json .vmlinux.objs .vmlinux.export.c
1479
1479
1480
1480
# Directories & files removed with 'make mrproper'
+8
-8
rust/Makefile
+8
-8
rust/Makefile
···
93
93
# and then retouch the generated files.
94
94
rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \
95
95
rustdoc-alloc rustdoc-kernel
96
-
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)
97
-
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)
96
+
$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/static.files/
97
+
$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/static.files/
98
98
$(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 sed -Ei \
99
-
-e 's:rust-logo\.svg:logo.svg:g' \
100
-
-e 's:rust-logo\.png:logo.svg:g' \
101
-
-e 's:favicon\.svg:logo.svg:g' \
102
-
-e 's:<link rel="alternate icon" type="image/png" href="[./]*favicon-(16x16|32x32)\.png">::g'
103
-
$(Q)echo '.logo-container > img { object-fit: contain; }' \
104
-
>> $(rustdoc_output)/rustdoc.css
99
+
-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
100
+
-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
101
+
-e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16|32x32)-[0-9a-f]+\.png">::g'
102
+
$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
103
+
echo ".logo-container > img { object-fit: contain; }" >> $$f; done
105
104
106
105
rustdoc-macros: private rustdoc_host = yes
107
106
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \
···
289
290
-fno-reorder-blocks -fno-allow-store-data-races -fasan-shadow-offset=% \
290
291
-fzero-call-used-regs=% -fno-stack-clash-protection \
291
292
-fno-inline-functions-called-once -fsanitize=bounds-strict \
293
+
-fstrict-flex-arrays=% \
292
294
--param=% --param asan-%
293
295
294
296
# Derived from `scripts/Makefile.clang`.
+2
-2
rust/kernel/error.rs
+2
-2
rust/kernel/error.rs
···
37
37
declare_err!(E2BIG, "Argument list too long.");
38
38
declare_err!(ENOEXEC, "Exec format error.");
39
39
declare_err!(EBADF, "Bad file number.");
40
-
declare_err!(ECHILD, "Exec format error.");
40
+
declare_err!(ECHILD, "No child processes.");
41
41
declare_err!(EAGAIN, "Try again.");
42
42
declare_err!(ENOMEM, "Out of memory.");
43
43
declare_err!(EACCES, "Permission denied.");
···
133
133
/// Returns the error encoded as a pointer.
134
134
#[allow(dead_code)]
135
135
pub(crate) fn to_ptr<T>(self) -> *mut T {
136
-
// SAFETY: self.0 is a valid error due to its invariant.
136
+
// SAFETY: `self.0` is a valid error due to its invariant.
137
137
unsafe { bindings::ERR_PTR(self.0.into()) as *mut _ }
138
138
}
139
139