From: Thomas Schwinge Date: Sun, 12 Feb 2023 15:37:19 +0000 (+0100) Subject: Merge commit '83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c' into HEAD X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebecfbd3519a1ee93083b46daaa57e4d666e46de;p=thirdparty%2Fgcc.git Merge commit '83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c' into HEAD Conflicts: gcc/rust/rust-gcc-diagnostics.cc gcc/rust/typecheck/rust-hir-trait-ref.h gcc/rust/typecheck/rust-hir-type-check-toplevel.cc gcc/rust/typecheck/rust-hir-type-check-toplevel.h gcc/rust/typecheck/rust-tyctx.cc gcc/rust/typecheck/rust-tyty-rules.h Upstream GCC commit r13-5197-g83ffe9cde7fe0b4deb0d1b54175fd9b19c38179c "Update copyright years" did updated those files that don't exist in GCC/Rust master branch anymore. --- ebecfbd3519a1ee93083b46daaa57e4d666e46de