mbox series

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

Message ID 20230709081903.GCZKptd16D1sbcDoIy@fat_crate.local
State New
Headers
Series [GIT,PULL] objtool/urgent for v6.5-rc1 |

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/objtool_urgent_for_v6.5_rc1

Message

Borislav Petkov July 9, 2023, 8:19 a.m. UTC 
  Hi Linus,

please pull a single urgent objtool fix for 6.5-rc1.

Thx.

---

The following changes since commit 6f612579be9d0ff527ca2e517e10bfaf08cc1860:

  Merge tag 'objtool-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2023-06-27 15:05:41 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/objtool_urgent_for_v6.5_rc1

for you to fetch changes up to cc592643a3ea1b2231628fb414dee203633a11c0:

  objtool: Remove btrfs_assertfail() from the noreturn exceptions list (2023-06-28 11:21:50 +0200)

----------------------------------------------------------------
- Fix a post-merge semantic conflict due to btrfs_assertfail() not being
  a noreturn function anymore

----------------------------------------------------------------
Ingo Molnar (1):
      objtool: Remove btrfs_assertfail() from the noreturn exceptions list

 tools/objtool/noreturns.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Linus Torvalds July 9, 2023, 5:20 p.m. UTC | #1 
On Sun, 9 Jul 2023 at 01:19, Borislav Petkov <bp@alien8.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
Borislav Petkov July 9, 2023, 5:38 p.m. UTC | #2 
On Sun, Jul 09, 2023 at 10:20:39AM -0700, Linus Torvalds wrote:
> 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").

Ah ok, for some reason that branch didn't get zapped in tip, hinting at
it needing to be sent.

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

Right, no need for that.

I've reset the tip branch and thus zapped the commit.

Thx.