From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Dec 2019 21:36:31 +0000 (-0800)
Subject: Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: v5.10.7~3688
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43a2898631a8beee66c1d64c1e860f43d96b2e91;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull more powerpc updates from Michael Ellerman:
 "A few commits splitting the KASAN instrumented bitops header in three,
  to match the split of the asm-generic bitops headers.

  This is needed on powerpc because we use the generic bitops for the
  non-atomic case only, whereas the existing KASAN instrumented bitops
  assume all the underlying operations are provided by the arch as
  arch_foo() versions.

  Thanks to: Daniel Axtens & Christophe Leroy"

* tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  docs/core-api: Remove possibly confusing sub-headings from Bit Operations
  powerpc: support KASAN instrumentation of bitops
  kasan: support instrumented bitops combined with generic bitops
---

43a2898631a8beee66c1d64c1e860f43d96b2e91