Skip to contentSkip to conversation

linux-next: Tree for Mar 9

DISCUSSION Mark Brown 4 participants 6 messages Mar 9 – Mar 10

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Changes since 20260306:

The net-next tree acquired a conflict with the net tree.

The mm tree acquired a build conflict with the ntfs tree for which I applied a patch.

The drm tree acquired a conflict with the drm-fixes tree.

The drm-misc tree acquired a conflict with the amdgpu tree.

The drm-misc tree acquired a conflict with the origin tree.

The block lost it's build failure.

The libata tree gained a conflict with the origin tree.

The sched-ext tree acquired a conflict with the tip tree.

The leds-lj lost it's build failure.

Non-merge commits (relative to Linus' tree): 4261

 4408 files changed, 304357 insertions(+), 76741 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master.

You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a defconfig for arm64, an allmodconfig for x86_64, a multi_v7_defconfig for arm, an arm64 build of various kselftests, a KUnit build and run on arm64, and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, arm64 allyesconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and pseries_le_defconfig and i386, s390, sparc and sparc64 defconfig and htmldocs.

Below is a summary of the state of the merge.

I am currently merging 409 trees (counting Linus' and 122 trees of bug fix patches pending for the current release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Thanks to Paul Gortmaker for triage and bug fixes.

#1 lore raw
Quoted 3 lines · Mark Brown

Hi all,

Changes since 20260306:

The 20260309 contains a file (some bug?) of more than 1GiB in size with interesting name:
": change inode->i_ino from unsigned long to u64" (without surrounding double quotes).

https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/

Mode Name Size
-rw-r--r-- .clang-format 24291 logstatsplain
-rw-r--r-- .clippy.toml 374 logstatsplain
-rw-r--r-- .cocciconfig 59 logstatsplain
-rw-r--r-- .editorconfig 566 logstatsplain
-rw-r--r-- .get_maintainer.ignore 270 logstatsplain
-rw-r--r-- .gitattributes 105 logstatsplain
-rw-r--r-- .gitignore 2238 logstatsplain
-rw-r--r-- .mailmap 54433 logstatsplain
-rw-r--r-- .pylintrc 66 logstatsplain
-rw-r--r-- .rustfmt.toml 369 logstatsplain
-rw-r--r-- : change inode->i_ino from unsigned long to u64 1173300385 logstatsplain
-rw-r--r-- COPYING 496 logstatsplain
-rw-r--r-- CREDITS 107693 logstatsplain
...

Please, drop this stuff, and remake the tag.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#2 lore raw
Quoted 7 lines · Andy Shevchenko
Quoted 3 lines · Mark Brown

Hi all,

Changes since 20260306:

The 20260309 contains a file (some bug?) of more than 1GiB in size with interesting name:
": change inode->i_ino from unsigned long to u64" (without surrounding double quotes).

Yes, the scripting tripped over itself during a conflict resolution and I didn't notice. It'll be gone tomorrow.

#3 lore raw
In reply to Mark Brown
Quoted 4 lines · Mark Brown

Hi all,

Changes since 20260306:

for linux-next 2026030[459]:

linux-next/Documentation/virt/kvm/api.rst:8547: ERROR: Malformed table. Text in column margin in table line 110.

=================================== ============================================
KVM_X86_QUIRK_LINT0_REENABLED By default, the reset value for the LVT

                                    LINT0 register is 0x700 (APIC_MODE_EXTINT).
                                    When this quirk is disabled, the reset value
                                    is 0x10000 (APIC_LVT_MASKED).

...
KVM_X86_QUIRK_VMCS12_FREEZE_IN_SMM_CC By default, KVM relaxes the consistency
check for GUEST_IA32_DEBUGCTL in vmcs12 to allow FREEZE_IN_SMM to be set. When this quirk is disabled, KVM requires this bit to be cleared. Note that the vmcs02 bit is still completely controlled by the host, regardless of the quirk setting.
=================================== ============================================

The last table entry does not fit into the table's "columns".

From:
commit 0f70db0758be

Author: Jim Mattson <[email protected]>
Date:   Thu Feb 5 15:15:26 2026 -0800
    KVM: x86: Introduce KVM_X86_QUIRK_VMCS12_FREEZE_IN_SMM_CC
Signature · 1 line
~Randy
#4 lore raw

Re: linux-next: Tree for Mar 9 (ntfs)

In reply to Mark Brown
Quoted 4 lines · Mark Brown

Hi all,

Changes since 20260306:

on ARCH=arm (32-bit):

../fs/ntfs/namei.c: In function 'ntfs_test_inode_attr':
../fs/ntfs/namei.c:813:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
813 | u64 mft_no = (u64)data;
| ^
../fs/ntfs/namei.c: In function 'ntfs_delete':
../fs/ntfs/namei.c:993:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

  993 |                                            (void *)ni->mft_no)) != NULL) {
      |    
Signature · 1 line
~Randy
#5 lore raw

Re: linux-next: Tree for Mar 9 (ntfs)

Quoted 11 lines · Randy Dunlap
Quoted 4 lines · Mark Brown

Hi all,

Changes since 20260306:

on ARCH=arm (32-bit):

Quoted 8 lines

../fs/ntfs/namei.c: In function 'ntfs_test_inode_attr':
../fs/ntfs/namei.c:813:22: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
813 | u64 mft_no = (u64)data;
| ^
../fs/ntfs/namei.c: In function 'ntfs_delete':
../fs/ntfs/namei.c:993:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

  993 |                                            (void *)ni->mft_no)) != NULL) {
      |

We will fix it.
Thanks for the report.