]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b92e09b 9f56eca)
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:30:50 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:30:50 +0000 (15:30 -0800)
Pull another libata patch from Tejun Heo:
 "One more patch from Adam added.

  It makes libata skip probing for NCQ prio unless the feature is
  explicitly requested by the user. This is necessary because some
  controllers lock up after the optional feature is probed"

* 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: avoid probing NCQ Prio Support if not explicitly requested

1  2 
drivers/ata/libata-core.c patch | diff1 | diff2 | blob | history
drivers/ata/libata-scsi.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ata/libata-core.c
Simple merge
diff --cc drivers/ata/libata-scsi.c
Simple merge
Beck SC1x5 Kernel