Merge tag 'asahi-soc-fixes-6.15' of https://github.com/AsahiLinux/linux into arm...
authorArnd Bergmann <arnd@arndb.de>
Fri, 9 May 2025 16:02:16 +0000 (18:02 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 9 May 2025 16:02:16 +0000 (18:02 +0200)
Apple SoC fixes for 6.15

This tag contains two small commits since rc1:
- Add a .mailmap entry requested by Asahi Lina to better filter her
  emails
- Mark the power domains for the touchbar support introduced with 6.15
  as always on since the driver cannot initialize the touchbar from
  scratch after the domains are powered off (e.g. during suspend).

* tag 'asahi-soc-fixes-6.15' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: touchbar: Mark ps_dispdfr_be as always-on
  mailmap: Update email for Asahi Lina

Link: https://lore.kernel.org/r/20250423145047.3098-1-sven@svenpeter.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
.mailmap

diff --cc .mailmap
Simple merge