[GIT,PULL] arm64 merge window fixes for -rc1

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-upstream

Message

Will Deacon June 11, 2020, 5:34 p.m. UTC

Hi Linus,

Please pull these arm64 fixes that came in during the merge window. They'll
probably be more to come, but it doesn't seem like it's worth me sitting
on these in the meantime.

Summary in the tag.

Cheers,

Will

--->8

The following changes since commit 082af5ec5080b028f7d0846a6c27cbb87f288205:

  Merge branch 'for-next/scs' into for-next/core (2020-05-28 18:03:40 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-upstream

for you to fetch changes up to dd4bc60765873445893037ae73a5f75398a8cd19:

  arm64: warn on incorrect placement of the kernel by the bootloader (2020-06-11 14:13:13 +0100)

----------------------------------------------------------------
arm64 merge window fixes for -rc1

- Fix SCS debug check to report max stack usage in bytes as advertised
- Fix typo: CONFIG_FTRACE_WITH_REGS => CONFIG_DYNAMIC_FTRACE_WITH_REGS
- Fix incorrect mask in HiSilicon L3C perf PMU driver
- Fix compat vDSO compilation under some toolchain configurations
- Fix false UBSAN warning from ACPI IORT parsing code
- Fix booting under bootloaders that ignore TEXT_OFFSET
- Annotate debug initcall function with '__init'

----------------------------------------------------------------
Ard Biesheuvel (1):
      arm64: warn on incorrect placement of the kernel by the bootloader

Christophe JAILLET (1):
      arm64: debug: mark a function as __init to save some memory

Joe Perches (1):
      arm64: ftrace: Change CONFIG_FTRACE_WITH_REGS to CONFIG_DYNAMIC_FTRACE_WITH_REGS

Nick Desaulniers (2):
      arm64: vdso32: add CONFIG_THUMB2_COMPAT_VDSO
      arm64: acpi: fix UBSAN warning

Shaokun Zhang (1):
      drivers/perf: hisi: Fix wrong value for all counters enable

Will Deacon (1):
      scs: Report SCS usage in bytes rather than number of entries

 arch/arm64/Kconfig                           | 11 ++++++++++-
 arch/arm64/include/asm/acpi.h                |  5 +++--
 arch/arm64/kernel/debug-monitors.c           |  2 +-
 arch/arm64/kernel/ftrace.c                   |  3 ++-
 arch/arm64/kernel/setup.c                    |  4 ++++
 arch/arm64/kernel/vdso32/Makefile            |  8 ++++++++
 drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c |  2 +-
 kernel/scs.c                                 |  2 +-
 8 files changed, 30 insertions(+), 7 deletions(-)

Comments

[e-mail] June 11, 2020, 10 p.m. UTC | #1

The pull request you sent on Thu, 11 Jun 2020 18:34:12 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-upstream

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/55d728b2b05fb0377a9048af3460c375b54619e2

Thank you!