mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	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: Thu, 4 Jan 2024 13:58:06 -0800	[thread overview]
Message-ID: <659729ee7673a_8dc682941d@dwillia2-xfh.jf.intel.com.notmuch> (raw)
In-Reply-To: <20240105085306.60979082@canb.auug.org.au>

Stephen Rothwell wrote:
> 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

Yes, will do that promptly. I am trying to figure out how this happend.

  reply	other threads:[~2024-01-04 21:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-01 15:32 Stephen Rothwell
2024-01-04 21:53 ` Stephen Rothwell
2024-01-04 21:58   ` Dan Williams [this message]
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=659729ee7673a_8dc682941d@dwillia2-xfh.jf.intel.com.notmuch \
    --to=dan.j.williams@intel.com \
    --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
all inboxes | Powered by JetHome®