* linux-next: manual merge of the tegra tree with Linus' tree
@ 2025-11-16 22:20 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-11-16 22:20 UTC (permalink / raw)
To: Colin Cross, Thierry Reding
Cc: Jon Hunter, Linux Kernel Mailing List, Linux Next Mailing List,
Theodore Ts'o
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-16 22:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-16 22:20 linux-next: manual merge of the tegra tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox