From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Mar 2022 19:57:42 +0000 (-0800)
Subject: Merge tag 'powerpc-5.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: ceph-for-5.18-rc5~401
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bdeaca18bf61d55029277bb35f72c2002c88c4d;p=ceph-client.git

Merge tag 'powerpc-5.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 "Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set.

  Thanks to Murilo Opsfelder Araujo, and Erhard F"

* tag 'powerpc-5.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s: Fix build failure when CONFIG_PPC_64S_HASH_MMU is not set
---

9bdeaca18bf61d55029277bb35f72c2002c88c4d