From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Sterba <dsterba@suse•cz>
Cc: Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the btrfs tree
Date: Tue, 24 Oct 2023 08:25:43 +1100 [thread overview]
Message-ID: <20231024082543.575b3edd@canb.auug.org.au> (raw)
In-Reply-To: <20231023175513.GL26353@twin.jikos.cz>
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
Hi David,
On Mon, 23 Oct 2023 19:55:13 +0200 David Sterba <dsterba@suse•cz> wrote:
>
> I have updated my for-next branch again, sorry (top commit 1a4dc97c883a4f763cbaf50).
> There are some fixes I don't want to miss from the 6.7 pull request.
> There should be minimal change to the VFS tree conflict resolution so
> the diff should be reusable.
So, why did you not just merge in v6.6-rc7 (or better yet, the branch
that contains the fix(es) that Linus merged) and then apply your new
commits on top of that? All the commits that were in the btrfs tree
have been rebased unchanged.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-23 21:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-08 23:48 linux-next: manual merge of the vfs-brauner tree with the btrfs tree Stephen Rothwell
2023-10-09 16:15 ` Christian Brauner
2023-10-10 21:37 ` Stephen Rothwell
2023-10-11 0:24 ` Stephen Rothwell
2023-10-11 9:20 ` David Sterba
2023-10-12 15:42 ` David Sterba
2023-10-23 17:55 ` David Sterba
2023-10-23 21:25 ` Stephen Rothwell [this message]
2023-10-24 8:59 ` upcoming merge window: " Christian Brauner
2023-10-24 15:46 ` David Sterba
2023-10-25 13:19 ` Christian Brauner
2023-10-28 14:10 ` upcoming merge window: Where did the patches we had intended to depend on go? " Christian Brauner
2023-10-24 15:32 ` linux-next: manual merge of the " David Sterba
2023-10-25 0:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-02 21:58 Stephen Rothwell
2025-12-02 0:58 ` Stephen Rothwell
2024-10-31 22:22 Stephen Rothwell
2024-10-15 21:51 Stephen Rothwell
2024-11-18 22:16 ` Stephen Rothwell
2024-06-18 11:41 Mark Brown
2024-07-16 0:58 ` Stephen Rothwell
2024-05-03 1:00 Stephen Rothwell
2024-05-14 1:38 ` Stephen Rothwell
2024-04-30 23:42 Stephen Rothwell
2023-12-06 23:32 Stephen Rothwell
2024-01-08 20:56 ` Stephen Rothwell
2023-11-26 22:20 Stephen Rothwell
2023-11-28 21:33 ` Nathan Chancellor
2023-11-29 11:09 ` Jan Kara
2023-11-29 20:50 ` Stephen Rothwell
2024-01-08 20:53 ` Stephen Rothwell
2023-11-26 22:14 Stephen Rothwell
2023-08-15 1:20 Stephen Rothwell
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=20231024082543.575b3edd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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