linux-kernel - Re: linux-next: duplicate patches in the cxl-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <659729ee7673a_8dc682941d@dwillia2-xfh.jf.intel.com.notmuch>
Date: Thu, 4 Jan 2024 13:58:06 -0800
From: Dan Williams <dan.j.williams@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Dan Williams
	<dan.j.williams@...el.com>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, "Linux Next
 Mailing List" <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the cxl-fixes tree

Stephen Rothwell wrote:
> Hi Dan,
> 
> On Tue, 2 Jan 2024 02:32:18 +1100 Stephen Rothwell <sfr@...b.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.