From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Dec 2021 19:42:01 +0000 (-0800)
Subject: Merge tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v6.6.17~8561
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f651faaaba5f41ffac195e64f58483721e60eafc;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'powerpc-5.16-5' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 "Fix DEBUG_WX never reporting any WX mappings, due to use of an
  incorrect config symbol since we converted to using generic ptdump"

* tag 'powerpc-5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/ptdump: Fix DEBUG_WX since generic ptdump conversion
---

f651faaaba5f41ffac195e64f58483721e60eafc