projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1dbbfe2 6aa0365)
Merge tag 'ata-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jun 2023 16:48:39 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Jun 2023 16:48:39 +0000 (09:48 -0700)
Pull ata fix from Damien Le Moal:

 - Avoid deadlocks on resume from sleep by delaying scsi rescan until
   the scsi device is also fully resumed.

* tag 'ata-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: libata-scsi: Avoid deadlock on rescan after device resume


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git