On Thu, 22 Feb 2024 16:41:12 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got conflicts in:
>
> scripts/Makefile.lib
> scripts/Makefile.ubsan
>
> between commit:
>
> 1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
>
> from the kspp tree.
Thanks, I'll drop the mm.git copy.
