Linux-XFS Archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@infradead.org>
Cc: Chandan Babu R <chandanbabu@kernel.org>, linux-xfs@vger.kernel.org
Subject: Re: [GIT PULL] bring back RT delalloc support
Date: Tue, 16 Apr 2024 10:11:53 -0700	[thread overview]
Message-ID: <20240416171153.GR11948@frogsfrogsfrogs> (raw)
In-Reply-To: <Zh6njnD-b9v7TPV8@infradead.org>

On Tue, Apr 16, 2024 at 09:30:06AM -0700, Christoph Hellwig wrote:
> On Tue, Apr 16, 2024 at 06:23:26PM +0530, Chandan Babu R wrote:
> > Christoph, I have pulled in many patches for v6.10-rc1 and am now encountering
> > merge conflicts with your "spring cleaning for xfs_extent_busy_clear"
> > patchset.
> 
> That shouldn't really conflict with this series.  It's also not anywhere
> near as important.
> 
> > Hence, please hold on until I update for-next branch. You could
> > rebase both the patchesets once the for-next branch is updated.
> 
> Ok.  And I'll give up on the pull requests as they seem to cause more
> trouble than they are useful.

The trick with that (or so I've found) is either to send reams of
patches for the release manager to integrate manually (ala the old way)
or to load up all your branches one after the other and send pull
requests for all of them at once.  Mixing the two leads to frustration.

--D

      reply	other threads:[~2024-04-16 17:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-02 12:50 [GIT PULL] bring back RT delalloc support Christoph Hellwig
2024-04-15  8:41 ` Chandan Babu R
2024-04-15 10:31   ` Christoph Hellwig
2024-04-15 13:04     ` Chandan Babu R
2024-04-16 12:53     ` Chandan Babu R
2024-04-16 16:30       ` Christoph Hellwig
2024-04-16 17:11         ` Darrick J. Wong [this message]

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=20240416171153.GR11948@frogsfrogsfrogs \
    --to=djwong@kernel.org \
    --cc=chandanbabu@kernel.org \
    --cc=hch@infradead.org \
    --cc=linux-xfs@vger.kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).