linux-kernel - linux-next: manual merge of the ext4 tree with the origin tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aO94i74VYW6Q9S4T@sirena.org.uk>
Date: Wed, 15 Oct 2025 11:33:47 +0100
From: Mark Brown <broonie@...nel.org>
To: Theodore Ts'o <tytso@....edu>
Cc: Jan Kara <jack@...e.cz>, Keguang Zhang <keguang.zhang@...il.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Subject: linux-next: manual merge of the ext4 tree with the origin tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)