Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Browse source

Pull libata updates from Tejun Heo:
 "Trivial changes except for special case timeout bumping.

  I have two more libata branches which depend on SCSI and dmaengine
  tree respectively.  I'll send pull requests for them once the
  prerequisite trees are pulled in"

* 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata-scsi: use %*ph to dump small buffers
  treewide: Fix typos in libata.xml
  libata-core: Allow longer timeout for drive spinup from PUIS
  libata: Fixup awkward whitespace in warning by removing line continuation.

...

This commit is contained in:

Linus Torvalds 2016-05-17 18:00:39 -07:00

parent 6f88b5be84 f8d1a93930

commit 0b7962a6c4

4 changed files with 20 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/ata/libahci.c

View file

22

drivers/ata/libata-core.c

View file

9

drivers/ata/libata-scsi.c

View file

3

include/linux/ata.h

View file