linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: bad commits in the v9fs tree
@ 2022-06-13 21:52 Stephen Rothwell
  2022-06-13 22:11 ` Dominique Martinet
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-06-13 21:52 UTC (permalink / raw)
  To: Dominique Martinet; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

Hi all,

Commits

  04608d78b66c ("Linux 5.19-rc1")
  9383b9134c66 ("fix the breakage in close_fd_get_file() calling conventions change")

look like they were rebased or cherry-picked from Linus' tree.from
Linus' tree.  From commits f2906aa86338 and 40a1926022d1 respectively.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: bad commits in the v9fs tree
  2022-06-13 21:52 linux-next: bad commits in the v9fs tree Stephen Rothwell
@ 2022-06-13 22:11 ` Dominique Martinet
  0 siblings, 0 replies; 2+ messages in thread
From: Dominique Martinet @ 2022-06-13 22:11 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

Stephen Rothwell wrote on Tue, Jun 14, 2022 at 07:52:23AM +1000:
>   04608d78b66c ("Linux 5.19-rc1")
>   9383b9134c66 ("fix the breakage in close_fd_get_file() calling conventions change")
> 
> look like they were rebased or cherry-picked from Linus' tree.from
> Linus' tree.  From commits f2906aa86338 and 40a1926022d1 respectively.

Ugh, thank you for noticing.
I had an overly eager `rebase -i` that are usually noop and don't touch
the top patches if left alone, but that only works if no merge is
involved and that wasn't the case here -- I'll be more careful with my
rebase root from now on so it hopefully won't happen again.

Fixed my 9p-next branch so these two should be gone next time you
update.


Thanks,
-- 
Dominique


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-13 22:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-13 21:52 linux-next: bad commits in the v9fs tree Stephen Rothwell
2022-06-13 22:11 ` Dominique Martinet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).