diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-19 20:46:10 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-19 20:46:10 +0300 |
commit | 4a1cc2e879c9fdfe1137060ce6de3bbe413630f6 (patch) | |
tree | e073651143ef4a0d54488bd21e4d4c24993cfed6 /block/ioctl.c | |
parent | 086675779097c6fe95e94058072462196ffd1870 (diff) | |
parent | 1d9995771fcbdd70d975b8dac4a201e76c9a2537 (diff) | |
download | linux-4a1cc2e879c9fdfe1137060ce6de3bbe413630f6.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions