From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the tip tree
Date: Tue, 11 Mar 2025 22:43:38 +1100 [thread overview]
Message-ID: <20250311224338.4baf583c@canb.auug.org.au> (raw)
In-Reply-To: <20250311020240.3b8c34b155f76fff5cccee01@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]
Hi Andrew,
On Tue, 11 Mar 2025 02:02:40 -0700 Andrew Morton <akpm@linux-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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-03-11 11:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 4:08 linux-next: duplicate patches in the tip tree Stephen Rothwell
2025-03-11 9:02 ` Andrew Morton
2025-03-11 11:43 ` Stephen Rothwell [this message]
2025-03-11 12:56 ` Thomas Gleixner
2025-03-25 21:47 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-03-20 9:46 Stephen Rothwell
2025-03-20 11:13 ` Mark Brown
2024-12-09 2:29 Stephen Rothwell
2024-12-09 11:08 ` Peter Zijlstra
2024-12-09 19:45 ` Andrew Morton
2024-12-09 20:21 ` Suren Baghdasaryan
2024-12-09 22:53 ` Thomas Gleixner
2024-11-18 21:02 Stephen Rothwell
2024-03-03 22:21 Stephen Rothwell
2024-03-04 9:21 ` Ingo Molnar
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=20250311224338.4baf583c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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