From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, 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: duplicate patches in the vfs-brauner tree
Date: Thu, 21 Dec 2023 10:50:48 +0000 [thread overview]
Message-ID: <1583609.1703155848@warthog.procyon.org.uk> (raw)
In-Reply-To: <20231221110016.21168260@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> It looks like the afs tree has been rebased since (part of) it was merged
> into the vfs-brauner tree. :-(
What's the best way to deal with this? Push these two patches down to the
bottom of the branches and then base both trees off those two same commits?
David
next prev parent reply other threads:[~2023-12-21 10:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 0:00 linux-next: duplicate patches in the vfs-brauner tree Stephen Rothwell
2023-12-21 10:50 ` David Howells [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-19 20:29 Stephen Rothwell
2025-01-20 22:20 Stephen Rothwell
2025-01-12 21:55 Stephen Rothwell
2025-01-05 23:10 Stephen Rothwell
2025-01-07 3:14 ` Andrew Morton
2025-01-10 11:08 ` Christian Brauner
2025-01-11 0:31 ` Andrew Morton
2024-10-20 11:08 Stephen Rothwell
2024-10-21 8:22 ` Christian Brauner
2024-10-15 22:02 Stephen Rothwell
2024-07-31 23:54 Stephen Rothwell
2024-07-24 22:00 Stephen Rothwell
2024-04-03 23:10 Stephen Rothwell
2024-04-03 23:59 ` Dominique Martinet
2024-04-04 0:21 ` Randy Dunlap
2024-04-04 1:44 ` Dominique Martinet
2024-04-05 10:57 ` Christian Brauner
2024-04-05 11:30 ` Dominique Martinet
2024-04-05 13:09 ` Christian Brauner
2024-04-04 2:09 ` Andrew Morton
2023-10-18 23:12 Stephen Rothwell
2023-10-19 5:36 ` Amir Goldstein
2023-10-19 9:18 ` Christian Brauner
2023-10-12 23:48 Stephen Rothwell
2023-10-13 6:32 ` Amir Goldstein
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=1583609.1703155848@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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