From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jun 2024 23:58:05 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2ccbdf43d5e758f8493a95252073cf9078a5fea5;p=linux.git

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

Pull ARM and clkdev fixes from Russell King:

 - Fix clkdev - erroring out on long strings causes boot failures, so
   don't do this. Still warn about the over-sized strings (which will
   never match and thus their registration with clkdev is useless)

 - Fix for ftrace with frame pointer unwinder with recent GCC changing
   the way frames are stacked.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9405/1: ftrace: Don't assume stack frames are contiguous in memory
  clkdev: don't fail clkdev_alloc() if over-sized
---

2ccbdf43d5e758f8493a95252073cf9078a5fea5