ksummit.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Vlastimil Babka <vbabka@suse.cz>
To: Steven Rostedt <rostedt@goodmis.org>, Mark Brown <broonie@kernel.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	ksummit@lists.linux.dev
Subject: Re: [MAINTAINERS SUMMIT] Hidden commits from next (aka why maintainers hoard them in backpack)
Date: Fri, 12 Sep 2025 11:52:18 +0200	[thread overview]
Message-ID: <68323a1d-eb5e-4a45-811b-653555cbf7c5@suse.cz> (raw)
In-Reply-To: <20250911102506.43ee7f9c@gandalf.local.home>

On 9/11/25 16:25, Steven Rostedt wrote:
> On Thu, 11 Sep 2025 14:40:45 +0100
> Mark Brown <broonie@kernel.org> wrote:
> 
> I now have several topic branches, and I try hard to avoid merges as they
> tend to make my pull requests more complex. But every so often, I have a
> patch that comes in that is required for work in two of my existing topic
> branches. This is a case where one change is required for two topic
> branches to continue more work.
> 
> In these rare events, I will apply the change to one of the topic branches,
> then merge it into the other with a detailed explanation to why I needed to
> do that merge.

Could you alternatively put the commit in a shared base of the two topic
branches, and thus avoid the merging? Or it is a case that you don't want to
rebase (at the moment because merge window is near, or ever?), or the change
can't be moved ahead of the other work in those topic branches?

> Linus hasn't complained about it, so I'm guessing that's the correct thing
> to do.
> 
> -- Steve
> 


  parent reply	other threads:[~2025-09-12  9:52 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-11 11:04 Krzysztof Kozlowski
2025-09-11 11:44 ` Krzysztof Kozlowski
2025-09-11 12:05 ` Mark Brown
2025-09-11 18:45   ` Dan Carpenter
2025-09-11 12:06 ` Jiri Kosina
2025-09-11 12:10   ` Krzysztof Kozlowski
2025-09-11 13:18   ` James Bottomley
2025-09-11 13:49     ` Mark Brown
2025-09-11 15:32       ` James Bottomley
2025-09-11 16:02         ` Mark Brown
2025-09-11 16:11           ` James Bottomley
2025-09-11 16:50             ` Mark Brown
2025-09-11 12:27 ` Laurent Pinchart
2025-09-11 12:31   ` Bartosz Golaszewski
2025-09-11 12:33     ` Laurent Pinchart
2025-09-11 12:42       ` Krzysztof Kozlowski
2025-09-11 12:58         ` Greg KH
2025-09-12  9:03         ` Dan Carpenter
2025-09-11 12:34   ` Geert Uytterhoeven
2025-09-11 12:35   ` Johannes Berg
2025-09-11 12:36     ` Laurent Pinchart
2025-09-11 12:48       ` Mark Brown
2025-09-11 12:47   ` Krzysztof Kozlowski
2025-09-11 12:53     ` Laurent Pinchart
2025-09-11 13:40   ` Mark Brown
2025-09-11 14:25     ` Steven Rostedt
2025-09-11 19:29       ` Laurent Pinchart
2025-09-11 19:43         ` Steven Rostedt
2025-09-12  9:52       ` Vlastimil Babka [this message]
2025-09-12 17:45         ` Steven Rostedt
2025-09-11 12:49 ` Sasha Levin
2025-09-12 11:55   ` Krzysztof Kozlowski
2025-12-14  1:19 ` Krzysztof Kozlowski

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=68323a1d-eb5e-4a45-811b-653555cbf7c5@suse.cz \
    --to=vbabka@suse.cz \
    --cc=broonie@kernel.org \
    --cc=krzk@kernel.org \
    --cc=ksummit@lists.linux.dev \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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