From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Sep 2016 19:41:19 +0000 (-0700)
Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~12831
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2507c856620cc7474e6101b0a05f82ac0ae5bf69;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Thomas Gleixner:
 "Two smallish fixes:

   - use the proper asm constraint in the Super-H atomic_fetch_ops

   - a trivial typo fix in the Kconfig help text"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text
  locking/atomic, arch/sh: Fix ATOMIC_FETCH_OP()
---

2507c856620cc7474e6101b0a05f82ac0ae5bf69