• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 2b6b38b0
    Linus Torvalds authored
    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
    2b6b38b0
ftrace.c 7.01 KB