From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>
Cc: 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 cxl-fixes tree
Date: Fri, 5 Jan 2024 08:53:06 +1100 [thread overview]
Message-ID: <20240105085306.60979082@canb.auug.org.au> (raw)
In-Reply-To: <20240102023218.3cd3e4ea@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
Hi Dan,
On Tue, 2 Jan 2024 02:32:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> A large number of commits in the cxl-fixes tree are also in Linus
> Torvalds' tree as different commits (but the same patches).
>
> A bad rebase onto v6.7-rc6 has been done. I cannot use this tree as
> it is.
Can this be fixed up, please?
$ git rebase --onto v6.7-rc6 251c56533a2c
should do it
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-04 21:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-01 15:32 linux-next: duplicate patches in the cxl-fixes tree Stephen Rothwell
2024-01-04 21:53 ` Stephen Rothwell [this message]
2024-01-04 21:58 ` Dan Williams
2024-01-04 22:09 ` Stephen Rothwell
2024-01-04 22:14 ` Dan Williams
2024-01-05 0:43 ` 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=20240105085306.60979082@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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