linux-kernel - Re: linux-next: manual merge of the char-misc tree with the mm-hotfixes 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]

Message-ID: <CANiq72keJ54v_qTm7TxoBhM8X=1xzN1nopkfG27G6ZQC=1C3-g@mail.gmail.com>
Date: Fri, 3 Oct 2025 14:17:43 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Mark Brown <broonie@...nel.org>
Cc: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>, Alice Ryhl <aliceryhl@...gle.com>, 
	Andrew Morton <akpm@...ux-foundation.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Matt Gilbride <mattgilbride@...gle.com>, 
	Wedson Almeida Filho <wedsonaf@...il.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 mm-hotfixes tree

On Fri, Oct 3, 2025 at 1:33 PM Mark Brown <broonie@...nel.org> wrote:
>
> [Sorry, forgot to grab the diff - was a trivial add/add conflict]

Yeah, accepting both sides is of course good -- I see it in
07586604e097 ("Merge branch 'char-misc-next' of
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git").

Thanks!

Cheers,
Miguel