linux-kernel - Re: linux-next: duplicate patches in the ext3 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] [day] [month] [year] [list]

Date:   Mon, 9 Jan 2023 10:51:05 +0100
From:   Jan Kara <jack@...e.cz>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jan Kara <jack@...e.cz>,
        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 ext3 tree

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@...e.com>
SUSE Labs, CR