[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wiY8nehcZfNA6vo_vws7TqvwcDrPNt6_McqkHXs4zbuNw@mail.gmail.com>
Date: Sun, 9 Jul 2023 10:20:39 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Borislav Petkov <bp@...en8.de>
Cc: x86-ml <x86@...nel.org>, lkml <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] objtool/urgent for v6.5-rc1
On Sun, 9 Jul 2023 at 01:19, Borislav Petkov <bp@...en8.de> 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
Powered by blists - more mailing lists