linux-kernel - linux-next: manual merge of the tip tree with the mm 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20250110134728.42c77894@canb.auug.org.au>
Date: Fri, 10 Jan 2025 13:47:28 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Suren Baghdasaryan
 <surenb@...gle.com>
Subject: linux-next: manual merge of the tip tree with the mm tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  include/linux/mm.h

between commits:

  0562d49197b9 ("mm: prepare lock_vma_under_rcu() for vma reuse possibility")
  db691d64f393 ("mm: convert mm_lock_seq to a proper seqcount")

from the mm-unstable branch of the mm tree and commit:

  eb449bd96954 ("mm: convert mm_lock_seq to a proper seqcount")

from the tip tree.

I fixed it up (I just used the mm tree version) 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

Content of type "application/pgp-signature" skipped