Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 16 Dec 2022 15:51:13 +0000
From:   Will Deacon <will@kernel.org>
To:     torvalds@linux-foundation.org
Cc:     catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, kernel-team@android.com
Subject: [GIT PULL] arm64 fixes for -rc1
Message-ID: <20221216155111.GA8949@willie-the-truck>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

Hi Linus,

Please pull these two arm64 fixes for -rc1, fixing issues introduced by
the recent pull for 6.2. They're both straightforward: a Kconfig tweak
and a revert. Summary in the tag.

There are some other fixes kicking around, but they're not urgent at all
(things like benign sparse warnings) so I'll get back to them in the new
year.

Cheers,

Will

--->8

The following changes since commit 5f4c374760b031f06c69c2fdad1b0e981a1ad42f:

  Merge branch 'for-next/undef-traps' into for-next/core (2022-12-06 11:34:25 +0000)

are available in the Git repository at:

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

for you to fetch changes up to c0cd1d541704c45030cbb2031612fdd68e8e15d5:

  Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption" (2022-12-15 17:59:12 +0000)

----------------------------------------------------------------
arm64 fixes for -rc1

- Fix Kconfig dependencies to re-allow the enabling of function graph
  tracer and shadow call stacks at the same time.

- Revert the workaround for CPU erratum #2645198 since the CONFIG_
  guards were incorrect and the code has therefore not seen any real
  exposure in -next.

----------------------------------------------------------------
Ard Biesheuvel (1):
      ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack

Will Deacon (1):
      Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption"

 Documentation/arm64/silicon-errata.rst |  2 --
 arch/Kconfig                           |  2 +-
 arch/arm64/Kconfig                     | 16 ----------------
 arch/arm64/include/asm/hugetlb.h       |  9 ---------
 arch/arm64/include/asm/pgtable.h       |  9 ---------
 arch/arm64/kernel/cpu_errata.c         |  7 -------
 arch/arm64/mm/hugetlbpage.c            | 21 ---------------------
 arch/arm64/mm/mmu.c                    | 21 ---------------------
 arch/arm64/tools/cpucaps               |  1 -
 9 files changed, 1 insertion(+), 87 deletions(-)