From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Colin Cross <ccross@android•com>, Thierry Reding <treding@nvidia•com>
Cc: Jon Hunter <jonathanh@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Theodore Ts'o <tytso@mit•edu>
Subject: linux-next: manual merge of the tegra tree with Linus' tree
Date: Mon, 17 Nov 2025 09:20:11 +1100 [thread overview]
Message-ID: <20251117092011.2993febb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 774 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm/configs/tegra_defconfig
between commit:
c065b6046b34 ("Use CONFIG_EXT4_FS instead of CONFIG_EXT3_FS in all of the defconfigs")
from Linus' tree and commit:
23a29a81b44e ("ARM: tegra: Enable EXT4 for Tegra")
from the tegra tree.
I fixed it up (the latter included the former change) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-11-16 22:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251117092011.2993febb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ccross@android$(echo .)com \
--cc=jonathanh@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=treding@nvidia$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/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