]> www.infradead.org Git - users/hch/dma-mapping.git/commit
Merge tag 'reset-fixes-for-v6.12' of git://git.pengutronix.de/pza/linux into arm...
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Oct 2024 20:36:53 +0000 (20:36 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Oct 2024 20:36:54 +0000 (20:36 +0000)
commit76237ff95bf7691f115b1b08a1fbdfd61bc398b1
treed2794b9d8a4e89439f50f612b789d49dedd57c66
parentb72cd67a0300f3a38e1121a91849b556fc31fad2
parent2cf59663660799ce16f4dfbed97cdceac7a7fa11
Merge tag 'reset-fixes-for-v6.12' of git://git.pengutronix.de/pza/linux into arm/fixes

Reset controller fixes for v6.12

Fix a NULL pointer dereference in reset-starfive-jh71x0 and replace two
accidental commas at line endings with semicolons in reset-npcm.

* tag 'reset-fixes-for-v6.12' of git://git.pengutronix.de/pza/linux:
  reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC
  reset: npcm: convert comma to semicolon

Link: https://lore.kernel.org/r/20240930165733.1541936-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>