Re: [GIT PULL] objtool/urgent for v6.5-rc1

From: Linus Torvalds
Date: Sun Jul 09 2023 - 13:21:03 EST


On Sun, 9 Jul 2023 at 01:19, Borislav Petkov <bp@xxxxxxxxx> wrote:
>
> - Fix a post-merge semantic conflict due to btrfs_assertfail() not being
> a noreturn function anymore

I had actually applied this directly last week already, since it was I
who had missed the semantic conflict.

See commit 06697ca69bca ("objtool: Remove btrfs_assertfail() from the
noreturn exceptions list").

Your pull request would obviously merge cleanly, but I'll just skip it
as "nothing new".

Linus