Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "Three fixes this time around: - Two fixes for noMMU, fixing the decompressor header layout, and preventing a build error with some configurations. - Fixing the hyp-stub updates that went in during the merge window for platforms that use MCPM" * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M ARM: 8676/1: NOMMU: provide pgprot_device() macro ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and cpu_power_down
Showing
- arch/arm/boot/compressed/efi-header.S 1 addition, 3 deletionsarch/arm/boot/compressed/efi-header.S
- arch/arm/boot/compressed/head.S 10 additions, 7 deletionsarch/arm/boot/compressed/head.S
- arch/arm/common/mcpm_entry.c 3 additions, 3 deletionsarch/arm/common/mcpm_entry.c
- arch/arm/include/asm/pgtable-nommu.h 1 addition, 0 deletionsarch/arm/include/asm/pgtable-nommu.h
Loading
Please register or sign in to comment