projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec6badf 21ed492)
Merge tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2021 18:19:57 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2021 18:19:57 +0000 (11:19 -0700)
Pull m68k fix from Geert Uytterhoeven:

 - Fix a Mac defconfig regression due to the IDE -> ATA switch

* tag 'm68k-for-v5.14-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: MAC should select HAVE_PATA_PLATFORM


Trivial merge
Linux 6.x block layer and io_uring tree(s)