Re: linux-next: manual merge of the char-misc tree with the mm-hotfixes tree

[Miguel Ojeda]

On Fri, Oct 3, 2025 at 1:33 PM Mark Brown <broonie@xxxxxxxxxx> 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