From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jan 2020 19:13:50 +0000 (-0800)
Subject: Merge tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v5.15~4810
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f2e9c3d28167b0f27d4be68e9101a9ecf397878;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull powerpc fixes from Michael Ellerman:
 "Two more powerpc fixes for 5.5:

   - One commit to fix a build error when CONFIG_JUMP_LABEL=n,
     introduced by our recent fix to is_shared_processor().

   - A commit marking some SLB related functions as notrace, as tracing
     them triggers warnings.

  Thanks to Jason A Donenfeld"

* tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/spinlocks: Include correct header for static key
  powerpc/mm: Mark get_slice_psize() & slice_addr_is_low() as notrace
---

6f2e9c3d28167b0f27d4be68e9101a9ecf397878