* linux-next: duplicate patches in the ext3 tree
@ 2023-01-08 1:51 Stephen Rothwell
2023-01-09 9:51 ` Jan Kara
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-01-08 1:51 UTC (permalink / raw)
To: Jan Kara; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
Hi all,
The following commits are also in Linus Torvalds' tree as different commits
(but the same patches):
ae9e9c7ff062 ("udf: Fix extension of the last extent in the file")
6d5ab7c2f7cf ("udf: initialize newblock to 0")
--
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: duplicate patches in the ext3 tree
2023-01-08 1:51 linux-next: duplicate patches in the ext3 tree Stephen Rothwell
@ 2023-01-09 9:51 ` Jan Kara
0 siblings, 0 replies; 2+ messages in thread
From: Jan Kara @ 2023-01-09 9:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jan Kara, Linux Kernel Mailing List, Linux Next Mailing List
Hello!
On Sun 08-01-23 12:51:56, Stephen Rothwell wrote:
> The following commits are also in Linus Torvalds' tree as different commits
> (but the same patches):
>
> ae9e9c7ff062 ("udf: Fix extension of the last extent in the file")
> 6d5ab7c2f7cf ("udf: initialize newblock to 0")
Yes, I'm sorry for the trouble. Linus considered the whole original pull
request too intrusive for rc3 so I've just cherrypicked the easy standalone
fixes and sent a pull request for those. I've now rebased my for_next
branch on top of Linus' tree to get rid of the duplicates (nobody depends
on my tree and there's enough time before the merge window opens so it
should be fine). If there's a better process how to handle such situations,
please tell me.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-09 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-08 1:51 linux-next: duplicate patches in the ext3 tree Stephen Rothwell
2023-01-09 9:51 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox