From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jan 2017 17:46:10 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v4.10-rc5~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a1cc2e879c9fdfe1137060ce6de3bbe413630f6;p=uclinux-h8%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/s390/linux

Pull two s390 bug fixes from Martin Schwidefsky:
 "Two changes, the first is a fix to add a missing memory clobber to the
  inline assembly to load control registers. This has not caused any
  issues so far, but who knows what code gcc will generate in future
  versions.

  The second change is an update for the default configurations. This
  includes CONFIG_BUG_ON_DATA_CORRUPTION=y, we want this to be enabled
  for s390. The usual approach to debug problems on production systems
  is to use crash on a system dump and for us avoiding data corruptions
  is priority one"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/ctl_reg: make __ctl_load a full memory barrier
---

4a1cc2e879c9fdfe1137060ce6de3bbe413630f6