From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jun 2020 17:55:29 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
X-Git-Tag: v5.15~3575
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfd230b3cfd6f72a6016fb0b319bb63fcc8206cd;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - fix for "hex" Kconfig default to use 0x0 rather than 0 to allow these
   to be removed from defconfigs

 - fix from Ard Biesheuvel for EFI HYP mode booting

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8985/1: efi/decompressor: deal with HYP mode boot gracefully
  ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0
---

cfd230b3cfd6f72a6016fb0b319bb63fcc8206cd