linux-kernel - Re: linux-next: duplicate patches in the tip 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250311224338.4baf583c@canb.auug.org.au>
Date: Tue, 11 Mar 2025 22:43:38 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the tip tree

Hi Andrew,

On Tue, 11 Mar 2025 02:02:40 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> Yup, thanks.  I trust it's not too much effort to simply skip the
> mm.git copies?

Not now that I have done it once ("git rerere" remembers my previous
merge resolutions).  Unless, of course, more changes are made to the
files involved ...

> There's presumably a better way of doing this, but it's really the
> first time it has happened in N years so it isn't obviously worth
> investing in setting something up.

This is why we have shared stable branches.  If the tip guys have all
those commits in a branch that they guarantee will not rebase (or be
rewritten), then you could fetch that branch and merge it into your
tree somewhere.  In this case, since we are beyond -rc6 and I presume
you are starting to think about your stable branches, you could start
mm-stable and merge it in there.  I assume that mm-unstable is always
based on top of mm-stable, right?  So the patches that depend on (or
clash with) the common commits will be rebased on top of the common
branch.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped