diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-16 09:24:44 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-16 09:24:44 -0700 |
commit | 2b6b38b04c2e7fe1713104768048fe2cae89c38e (patch) | |
tree | 8a56f967aa7062589d45749f1ef032a3a0fcf6f4 /drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | |
parent | Merge tag 'edac_fix_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
parent | s390/virtio: change virtio_feature_desc:features type to __le32 (diff) | |
download | linux-dev-2b6b38b04c2e7fe1713104768048fe2cae89c38e.tar.xz linux-dev-2b6b38b04c2e7fe1713104768048fe2cae89c38e.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- convert the debug feature to refcount_t
- reduce the copy size for strncpy_from_user
- 8 bug fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/virtio: change virtio_feature_desc:features type to __le32
s390: convert debug_info.ref_count from atomic_t to refcount_t
s390: move _text symbol to address higher than zero
s390/qdio: increase string buffer size
s390/ccwgroup: increase string buffer size
s390/topology: let topology_mnest_limit() return unsigned char
s390/uaccess: use sane length for __strncpy_from_user()
s390/uprobes: fix compile for !KPROBES
s390/ftrace: fix compile for !MODULES
s390/cputime: fix incorrect system time
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c')
0 files changed, 0 insertions, 0 deletions