From: Nathan Chancellor <nathan@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: Jonathan Corbet <corbet@lwn•net>,
Daniel Pereira <danielmaraboo@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild tree
Date: Tue, 2 Jun 2026 18:17:51 -0700 [thread overview]
Message-ID: <20260603011751.GB1940387@ax162> (raw)
In-Reply-To: <ah7hUGlwC-lBwDvc@sirena.org.uk>
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
next prev parent reply other threads:[~2026-06-03 1:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 13:57 linux-next: manual merge of the jc_docs tree with the kbuild tree Mark Brown
2026-06-03 1:17 ` Nathan Chancellor [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:41 Mark
2026-01-26 22:55 ` Nathan Chancellor
2020-03-11 1:07 Stephen Rothwell
2017-06-26 1:13 Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2017-07-03 16:43 ` Kamil Rytarowski
2017-07-03 18:13 ` Jonathan Corbet
2017-07-03 18:33 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260603011751.GB1940387@ax162 \
--to=nathan@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=corbet@lwn$(echo .)net \
--cc=danielmaraboo@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox