Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild tree

From: Nathan Chancellor <[email-masked]>
Date: Tue, 2 Jun 2026 18:17:51 -0700

On Tue, Jun 02, 2026 at 02:57:36PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/translations/pt_BR/process/changes.rst
> 
> between commit:
> 
>   ce3267a39a92b ("kbuild: Bump minimum version of LLVM for building the kernel to 17.0.1")
> 
> from the kbuild tree and commit:
> 
>   1af866584f7e6 ("docs: pt_BR: update minimal software requirements in changes.rst")
> 
> from the jc_docs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc Documentation/translations/pt_BR/process/changes.rst
> index 6bbfe60fd9730,a105581dcf64e..0000000000000
> --- a/Documentation/translations/pt_BR/process/changes.rst
> +++ b/Documentation/translations/pt_BR/process/changes.rst
> @@@ -28,12 -29,12 +29,12 @@@ necessárias em todos os sistemas; obvi
>   PC Card por exemplo, provavelmente não precisará se preocupar com o pcmciautils.
>   
>   ====================== ===============  ========================================
> -         Programa        Versão mínima       Comando para verificar a versão
> + Programa               Versão mínima    Comando para verificar a versão
>   ====================== ===============  ========================================
>   GNU C                  8.1              gcc --version
>  -Clang/LLVM (optional)  15.0.0           clang --version
>  +Clang/LLVM (optional)  17.0.1           clang --version
> - Rust (optional)        1.78.0           rustc --version
> - bindgen (optional)     0.65.1           bindgen --version
> + Rust (optional)        1.85.0           rustc --version
> + bindgen (optional)     0.71.1           bindgen --version
>   GNU make               4.0              make --version
>   bash                   4.2              bash --version
>   binutils               2.30             ld -v

Thanks, looks good to me. Noted for my 7.2 pull request.

-- 
Cheers,
Nathan