Merge commit 'c293393faa8e11a5a80a9e358718432b8697f451' into partial2
Fix debug macro
Merge commit '6451d7783ba5ff24eb1a544eaa6665b890f30466' into partial2
Fix compilation after merge
Merge commit 'f3270b16e00f0614fa418dcc50883da5949375b4' into partial2
ARM: fix memblock breakage

Will says:
| Commit e63075a3 removed the explicit MEMBLOCK_REAL_LIMIT #define
| and introduced the requirement that arch code calls
| memblock_set_current_limit to ensure that the __va macro can
| be used on physical addresses returned from memblock_alloc.

Unfortunately, ARM was missed out of this change.  Fix this.

Reported-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Merge branch 'partial2' into forward

Conflicts:
	arch/arm/mach-meson3/include/mach/debug-macro.S