1. 25 May, 2019 2 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · a2c48d98
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Tom Zanussi sent me some small fixes and cleanups to the histogram
        code and I forgot to incorporate them.
      
        I also added a small clean up patch that was sent to me a while ago
        and I just noticed it"
      
      * tag 'trace-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        kernel/trace/trace.h: Remove duplicate header of trace_seq.h
        tracing: Add a check_val() check before updating cond_snapshot() track_val
        tracing: Check keys for variable references in expressions too
        tracing: Prevent hist_field_var_ref() from accessing NULL tracing_map_elts
      a2c48d98
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 2409207a
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is the same set of patches sent in the merge window as the final
        pull except that Martin's read only rework is replaced with a simple
        revert of the original change that caused the regression.
      
        Everything else is an obvious fix or small cleanup"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        Revert "scsi: sd: Keep disk read-only when re-reading partition"
        scsi: bnx2fc: fix incorrect cast to u64 on shift operation
        scsi: smartpqi: Reporting unhandled SCSI errors
        scsi: myrs: Fix uninitialized variable
        scsi: lpfc: Update lpfc version to 12.2.0.2
        scsi: lpfc: add check for loss of ndlp when sending RRQ
        scsi: lpfc: correct rcu unlock issue in lpfc_nvme_info_show
        scsi: lpfc: resolve lockdep warnings
        scsi: qedi: remove set but not used variables 'cdev' and 'udev'
        scsi: qedi: remove memset/memcpy to nfunc and use func instead
        scsi: qla2xxx: Add cleanup for PCI EEH recovery
      2409207a
  2. 24 May, 2019 38 commits