From: Mark Brown <broonie@kernel•org>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Jan Kara <jack@suse•cz>, Keguang Zhang <keguang.zhang@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>
Subject: linux-next: manual merge of the ext4 tree with the origin tree
Date: Wed, 15 Oct 2025 11:33:47 +0100 [thread overview]
Message-ID: <aO94i74VYW6Q9S4T@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]
Hi all,
Today's linux-next merge of the ext4 tree got conflicts in:
arch/mips/configs/loongson1_defconfig
arch/mips/configs/loongson1c_defconfig
between commit:
ad79935dbc227 ("MIPS: configs: Consolidate Loongson1 defconfigs")
from the origin tree and commit:
acf943e9768ec ("ext4: fix checks for orphan inodes")
from the ext4 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 arch/mips/configs/loongson1_defconfig
index 81acae6f61c8b,a64a394479638..0000000000000
--- a/arch/mips/configs/loongson1_defconfig
+++ b/arch/mips/configs/loongson1_defconfig
@@@ -138,20 -86,17 +138,24 @@@ CONFIG_NEW_LEDS=
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_MTD=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_LOONGSON1=y
+# CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_DRV_LOONGSON=y
+CONFIG_DMADEVICES=y
+CONFIG_LOONGSON1_APB_DMA=y
+# CONFIG_VIRTIO_MENU is not set
+# CONFIG_VHOST_MENU is not set
+# CONFIG_MIPS_PLATFORM_DEVICES is not set
# CONFIG_IOMMU_SUPPORT is not set
- # CONFIG_NVMEM is not set
+ CONFIG_EXT2_FS=y
+ CONFIG_EXT2_FS_XATTR=y
+ CONFIG_EXT2_FS_POSIX_ACL=y
+ CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
+ CONFIG_EXT4_FS_SECURITY=y
# CONFIG_DNOTIFY is not set
CONFIG_VFAT_FS=y
CONFIG_PROC_KCORE=y
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-10-15 10:33 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=aO94i74VYW6Q9S4T@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=keguang.zhang@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tsbogend@alpha$(echo .)franken.de \
--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